diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ced4799531eb..e70519f16f03 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -761,6 +761,9 @@ jobs:
       - name: ide/projectuiapi.base
         run: ant $OPTS -f ide/projectuiapi.base test
 
+      - name: ide/projectui
+        run: ant $OPTS -f ide/projectui test
+
       - name: ide/refactoring.api
         run: ant $OPTS -f ide/refactoring.api test
 
diff --git a/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectUtilitiesTest.java b/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectUtilitiesTest.java
index 2a26e7a04af3..6b38736a7435 100644
--- a/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectUtilitiesTest.java
+++ b/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectUtilitiesTest.java
@@ -23,20 +23,16 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
 import javax.swing.SwingUtilities;
 import javax.swing.text.BadLocationException;
 import junit.framework.Test;
-import junit.framework.TestSuite;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectManager;
 import org.netbeans.junit.MockServices;
 import org.netbeans.junit.NbTestCase;
 import org.netbeans.junit.NbTestSuite;
-import org.netbeans.junit.RandomlyFails;
 import org.netbeans.modules.project.ui.actions.TestSupport;
 import org.netbeans.spi.project.AuxiliaryConfiguration;
 import org.openide.cookies.EditorCookie;
@@ -49,7 +45,6 @@
 import org.openide.text.CloneableEditorSupport;
 import org.openide.util.Lookup;
 import org.openide.util.lookup.Lookups;
-import org.openide.util.test.RestrictThreadCreation;
 import org.openide.windows.CloneableTopComponent;
 import org.openide.windows.TopComponent;
 import org.openide.windows.WindowManager;
@@ -135,16 +130,6 @@ protected void setUp () throws Exception {
         (tc1_1_navigator = new SimpleTopComponent2 (do1_1_open, NAVIGATOR_MODE)).open ();
         
         ExitDialog.SAVE_ALL_UNCONDITIONALLY = true;
-
-        RestrictThreadCreation.permitStandard();
-        RestrictThreadCreation.permit(OpenProjectList.class.getName() + "$LoadOpenProjects.waitFinished",
-                OpenProjectList.class.getName() + "$LoadOpenProjects.resultChanged",
-                "org.openide.text.CloneableEditorSupport.prepareDocument",
-                "org.openide.text.CloneableEditor.initialize",
-                "org.openide.util.lookup.MetaInfServicesLookup.beforeLookup",
-                "org.netbeans.modules.project.ui.OpenProjectList.close",
-                "org.netbeans.modules.project.ui.OpenProjectList.doOpenProject");
-        RestrictThreadCreation.forbidNewThreads(false);
     }
     
     @SuppressWarnings("deprecation")
diff --git a/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodeInitializedSoonerTest.java b/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodeInitializedSoonerTest.java
index d406d088edbc..f2e53a05ddf7 100644
--- a/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodeInitializedSoonerTest.java
+++ b/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodeInitializedSoonerTest.java
@@ -29,6 +29,7 @@
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
+import java.util.logging.Logger;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectManager;
 import org.netbeans.api.project.ui.OpenProjects;
@@ -122,9 +123,10 @@ public void close() throws SecurityException {
         }
         H h = new H();
         h.setLevel(Level.ALL);
-        OpenProjectList.LOGGER.addHandler(h);
-        OpenProjectList.LOGGER.setUseParentHandlers(false);
-        OpenProjectList.LOGGER.setLevel(Level.ALL);
+        Logger projectsRootNodeLOG = Logger.getLogger("org.netbeans.modules.project.ui.ProjectsRootNode");
+        projectsRootNodeLOG.addHandler(h);
+        projectsRootNodeLOG.setUseParentHandlers(false);
+        projectsRootNodeLOG.setLevel(Level.ALL);
 
         assertEquals("30 children", 30, logicalView.getChildren().getNodesCount(true));
 
diff --git a/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodePhysicalViewTest.java b/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodePhysicalViewTest.java
index 271d0abab266..e53a8884791d 100644
--- a/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodePhysicalViewTest.java
+++ b/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodePhysicalViewTest.java
@@ -34,6 +34,7 @@
 import org.netbeans.junit.NbTestCase;
 import org.netbeans.junit.RandomlyFails;
 import org.netbeans.modules.project.ui.actions.TestSupport;
+import org.netbeans.modules.projectapi.nb.TimedWeakReference;
 import org.netbeans.spi.project.ui.LogicalViewProvider;
 import org.netbeans.spi.project.ui.ProjectOpenedHook;
 import org.openide.filesystems.FileObject;
@@ -67,6 +68,8 @@ Lookup createLookup(TestSupport.TestProject project, Object instance) {
     @Override
     protected void setUp() throws Exception {
         clearWorkDir();
+
+        TimedWeakReference.TIMEOUT = 1;
         
         MockServices.setServices(TestSupport.TestProjectFactory.class);
         
diff --git a/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodeTest.java b/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodeTest.java
index cc8087f7a9df..d47d9c0a6670 100644
--- a/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodeTest.java
+++ b/ide/projectui/test/unit/src/org/netbeans/modules/project/ui/ProjectsRootNodeTest.java
@@ -403,7 +403,7 @@ public void testReplaceProjectSingleNonRootNode() throws Exception { // #197864
             }
         };
         ProjectsRootNode.checkNoLazyNode(ch);
-        Node[] ns = ch.getNodes(true);
+        Node[] ns = ch.getNodes(false);
         assertEquals(1, ns.length);
         assertEquals("p - Testing", ns[0].getDisplayName());
     }