diff --git a/modules/tuxedo.testrunner/nbproject/project.xml b/modules/tuxedo.testrunner/nbproject/project.xml
--- a/modules/tuxedo.testrunner/nbproject/project.xml
+++ b/modules/tuxedo.testrunner/nbproject/project.xml
@@ -63,8 +63,16 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.31</specification-version>
+                        <release-version>2</release-version>
+                        <specification-version>2.0</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.gsf.testrunner.ui</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -81,7 +89,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.47.1</specification-version>
+                        <specification-version>9.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -97,7 +105,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.21.1</specification-version>
+                        <specification-version>7.23</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -113,7 +121,15 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>8.15.1</specification-version>
+                        <specification-version>9.0</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.base</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>9.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/TestRunnerProviderImpl.java b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/TestRunnerProviderImpl.java
--- a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/TestRunnerProviderImpl.java
+++ b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/TestRunnerProviderImpl.java
@@ -20,7 +20,7 @@
 import org.netbeans.api.extexecution.ExecutionDescriptor.LineConvertorFactory;
 import org.netbeans.api.extexecution.print.LineConvertor;
 import org.netbeans.api.project.Project;
-import org.netbeans.modules.gsf.testrunner.api.Manager;
+import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
 import org.netbeans.modules.gsf.testrunner.api.RerunHandler;
 import org.netbeans.modules.gsf.testrunner.api.RerunType;
 import org.netbeans.modules.gsf.testrunner.api.TestSession;
@@ -40,9 +40,10 @@
     public void run(Project project, TuxedoSCAClient test, final TestRun run) {
         final TestSession session = new TestSession("Test", // NOI18N
                 project,
-                SessionType.TEST, new CndTestRunnerNodeFactory());
+                SessionType.TEST);
 
         final Manager manager = Manager.getInstance();
+        manager.setNodeFactory(new CndTestRunnerNodeFactory());
         CndUnitHandlerFactory predefinedFactory = new CndUnitHandlerFactory();
 
         final List<TestHandlerFactory> factories = new ArrayList<TestHandlerFactory>();
diff --git a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/spi/TestRecognizerHandler.java b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/spi/TestRecognizerHandler.java
--- a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/spi/TestRecognizerHandler.java
+++ b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/spi/TestRecognizerHandler.java
@@ -9,7 +9,7 @@
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.netbeans.modules.gsf.testrunner.api.Manager;
+import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
 import org.netbeans.modules.gsf.testrunner.api.TestSession;
 
 /**
diff --git a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/BaseTestMethodNodeAction.java b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/BaseTestMethodNodeAction.java
--- a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/BaseTestMethodNodeAction.java
+++ b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/BaseTestMethodNodeAction.java
@@ -7,7 +7,7 @@
 import java.util.Collection;
 import java.util.logging.Logger;
 import org.netbeans.api.project.Project;
-import org.netbeans.modules.gsf.testrunner.api.TestNodeAction;
+import org.netbeans.modules.gsf.testrunner.ui.api.TestNodeAction;
 import org.netbeans.modules.gsf.testrunner.api.Testcase;
 import org.openide.filesystems.FileObject;
 import org.openide.util.Lookup;
diff --git a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndCallstackFrameNode.java b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndCallstackFrameNode.java
--- a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndCallstackFrameNode.java
+++ b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndCallstackFrameNode.java
@@ -5,8 +5,8 @@
 package com.sun.tools.tuxedo.testrunner.ui;
 
 import javax.swing.Action;
-import org.netbeans.modules.gsf.testrunner.api.CallstackFrameNode;
-import org.netbeans.modules.gsf.testrunner.api.DiffViewAction;
+import org.netbeans.modules.gsf.testrunner.ui.api.CallstackFrameNode;
+import org.netbeans.modules.gsf.testrunner.ui.api.DiffViewAction;
 import org.netbeans.modules.gsf.testrunner.api.Trouble.ComparisonFailure;
 import org.openide.util.actions.SystemAction;
 
diff --git a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestMethodNode.java b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestMethodNode.java
--- a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestMethodNode.java
+++ b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestMethodNode.java
@@ -8,9 +8,9 @@
 import java.util.List;
 import javax.swing.Action;
 import org.netbeans.api.project.Project;
-import org.netbeans.modules.gsf.testrunner.api.DiffViewAction;
-import org.netbeans.modules.gsf.testrunner.api.Locator;
-import org.netbeans.modules.gsf.testrunner.api.TestMethodNode;
+import org.netbeans.modules.gsf.testrunner.ui.api.DiffViewAction;
+import org.netbeans.modules.gsf.testrunner.ui.api.Locator;
+import org.netbeans.modules.gsf.testrunner.ui.api.TestMethodNode;
 import org.netbeans.modules.gsf.testrunner.api.Testcase;
 import org.openide.nodes.Node;
 import org.openide.util.NbBundle;
diff --git a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestRunnerNodeFactory.java b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestRunnerNodeFactory.java
--- a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestRunnerNodeFactory.java
+++ b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestRunnerNodeFactory.java
@@ -5,9 +5,9 @@
 package com.sun.tools.tuxedo.testrunner.ui;
 
 import org.netbeans.api.project.Project;
-import org.netbeans.modules.gsf.testrunner.api.TestRunnerNodeFactory;
+import org.netbeans.modules.gsf.testrunner.ui.api.TestRunnerNodeFactory;
 import org.netbeans.modules.gsf.testrunner.api.Testcase;
-import org.netbeans.modules.gsf.testrunner.api.TestsuiteNode;
+import org.netbeans.modules.gsf.testrunner.ui.api.TestsuiteNode;
 import org.openide.nodes.Node;
 
 /**
diff --git a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestsuiteNode.java b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestsuiteNode.java
--- a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestsuiteNode.java
+++ b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestsuiteNode.java
@@ -7,9 +7,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.Action;
-import org.netbeans.modules.gsf.testrunner.api.Locator;
+import org.netbeans.modules.gsf.testrunner.ui.api.Locator;
 import org.netbeans.modules.gsf.testrunner.api.Testcase;
-import org.netbeans.modules.gsf.testrunner.api.TestsuiteNode;
+import org.netbeans.modules.gsf.testrunner.ui.api.TestsuiteNode;
 import org.openide.nodes.Node;
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
diff --git a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndUnitHandlerFactory.java b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndUnitHandlerFactory.java
--- a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndUnitHandlerFactory.java
+++ b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndUnitHandlerFactory.java
@@ -13,7 +13,7 @@
 import java.util.regex.Pattern;
 import com.sun.tools.tuxedo.testrunner.spi.TestRecognizerHandler;
 import com.sun.tools.tuxedo.testrunner.spi.TestHandlerFactory;
-import org.netbeans.modules.gsf.testrunner.api.Manager;
+import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
 import org.netbeans.modules.gsf.testrunner.api.TestSession;
 import org.netbeans.modules.gsf.testrunner.api.TestSuite;
 import org.netbeans.modules.gsf.testrunner.api.Testcase;
diff --git a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/TestRunnerLineConvertor.java b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/TestRunnerLineConvertor.java
--- a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/TestRunnerLineConvertor.java
+++ b/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/TestRunnerLineConvertor.java
@@ -11,7 +11,7 @@
 import java.util.logging.Logger;
 import org.netbeans.api.extexecution.print.ConvertedLine;
 import org.netbeans.api.extexecution.print.LineConvertor;
-import org.netbeans.modules.gsf.testrunner.api.Manager;
+import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
 import org.netbeans.modules.gsf.testrunner.api.RerunHandler;
 import org.netbeans.modules.gsf.testrunner.api.TestSession;
 
@@ -37,7 +37,7 @@
 
     public synchronized void refreshSession() {
         RerunHandler handler = this.session.getRerunHandler();
-        this.session = new TestSession(session.getName(), session.getProject(), session.getSessionType(), session.getNodeFactory());
+        this.session = new TestSession(session.getName(), session.getProject(), session.getSessionType());
         session.setRerunHandler(handler);
     }