diff --git a/ide-test/org.codehaus.groovy.alltests/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.alltests/META-INF/MANIFEST.MF
index cfbaaa68a6..93e19f8051 100644
--- a/ide-test/org.codehaus.groovy.alltests/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.alltests/META-INF/MANIFEST.MF
@@ -14,7 +14,4 @@ Import-Package: org.codehaus.groovy.eclipse.codeassist.tests,
  org.codehaus.groovy.eclipse.quickfix.test.templates,
  org.codehaus.groovy.eclipse.refactoring.test
 Require-Bundle: org.codehaus.groovy.eclipse.core.test;bundle-version="2.9.2",
- org.codehaus.groovy.eclipse.tests;bundle-version="2.9.2",
- org.eclipse.ui.editors,
- org.eclipse.ui.forms,
- org.eclipse.ui
+ org.codehaus.groovy.eclipse.tests;bundle-version="2.9.2"
diff --git a/ide-test/org.codehaus.groovy.eclipse.codeassist.completion.test/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.codeassist.completion.test/META-INF/MANIFEST.MF
index 1dffc0a568..f0ecf9810c 100644
--- a/ide-test/org.codehaus.groovy.eclipse.codeassist.completion.test/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.codeassist.completion.test/META-INF/MANIFEST.MF
@@ -5,9 +5,5 @@ Bundle-SymbolicName: org.codehaus.groovy.eclipse.codeassist.completion.test;sing
 Bundle-Name: Groovy Content Assist Tests
 Bundle-Version: 2.9.2.qualifier
 Export-Package: org.codehaus.groovy.eclipse.codeassist.tests
-Import-Package: org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui.internal,
- org.eclipse.ui.texteditor
 Require-Bundle: org.codehaus.groovy.eclipse.codeassist.completion;bundle-version="2.9.2",
  org.codehaus.groovy.eclipse.tests;bundle-version="2.9.2"
diff --git a/ide-test/org.codehaus.groovy.eclipse.codebrowsing.test/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.codebrowsing.test/META-INF/MANIFEST.MF
index 1f4cb0307c..caa1936225 100644
--- a/ide-test/org.codehaus.groovy.eclipse.codebrowsing.test/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.codebrowsing.test/META-INF/MANIFEST.MF
@@ -5,10 +5,6 @@ Bundle-SymbolicName: org.codehaus.groovy.eclipse.codebrowsing.test;singleton:=tr
 Bundle-Name: Groovy Code Browsing Tests
 Bundle-Version: 2.9.2.qualifier
 Export-Package: org.codehaus.groovy.eclipse.codebrowsing.tests
-Import-Package: org.eclipse.core.filebuffers,
- org.eclipse.core.filesystem
+Import-Package: org.eclipse.core.filesystem
 Require-Bundle: org.codehaus.groovy.eclipse.codebrowsing;bundle-version="2.9.2",
- org.codehaus.groovy.eclipse.tests;bundle-version="2.9.2",
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
- org.eclipse.ui
+ org.codehaus.groovy.eclipse.tests;bundle-version="2.9.2"
diff --git a/ide-test/org.codehaus.groovy.eclipse.core.test/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.core.test/META-INF/MANIFEST.MF
index 736f5d11b5..9fd424bf2f 100644
--- a/ide-test/org.codehaus.groovy.eclipse.core.test/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.core.test/META-INF/MANIFEST.MF
@@ -7,6 +7,5 @@ Bundle-Version: 2.9.2.qualifier
 Bundle-ClassPath: .,
  lib/commons-io-1.3.1.jar
 Export-Package: org.codehaus.groovy.eclipse.core
-Import-Package: org.eclipse.jface.text
 Require-Bundle: org.codehaus.groovy.eclipse.tests;bundle-version="2.9.2"
 Eclipse-BundleShape: dir
diff --git a/ide-test/org.codehaus.groovy.eclipse.dsl.tests/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.dsl.tests/META-INF/MANIFEST.MF
index 48fba78a42..b6072e2e71 100644
--- a/ide-test/org.codehaus.groovy.eclipse.dsl.tests/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.dsl.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.codehaus.groovy.eclipse.dsl.tests;singleton:=true
 Bundle-Name: Groovy DSL Tests
 Bundle-Version: 2.9.2.qualifier
 Export-Package: org.codehaus.groovy.eclipse.dsl.tests
-Import-Package: org.eclipse.ui.plugin
 Require-Bundle: org.codehaus.groovy.eclipse.codeassist.completion.test;bundle-version="2.9.2",
  org.codehaus.groovy.eclipse.tests;bundle-version="2.9.2",
  org.codehaus.groovy.eclipse.dsl;bundle-version="2.9.2"
diff --git a/ide-test/org.codehaus.groovy.eclipse.junit.test/src/org/codehaus/groovy/eclipse/junit/test/JUnitTestCase.groovy b/ide-test/org.codehaus.groovy.eclipse.junit.test/src/org/codehaus/groovy/eclipse/junit/test/JUnitTestCase.groovy
index 632e190da3..a298c3bf1d 100644
--- a/ide-test/org.codehaus.groovy.eclipse.junit.test/src/org/codehaus/groovy/eclipse/junit/test/JUnitTestCase.groovy
+++ b/ide-test/org.codehaus.groovy.eclipse.junit.test/src/org/codehaus/groovy/eclipse/junit/test/JUnitTestCase.groovy
@@ -29,6 +29,7 @@ abstract class JUnitTestCase {
     @BeforeClass
     static final void setUpTestSuite() {
         new EclipseTestSetup(null).setUp()
+        EclipseTestSetup.addJUnit4()
     }
 
     @AfterClass
@@ -43,8 +44,6 @@ abstract class JUnitTestCase {
     final void setUpTestCase() {
         println '----------------------------------------'
         println 'Starting: ' + test.getMethodName()
-
-        EclipseTestSetup.addJUnit4()
     }
 
     @After
diff --git a/ide-test/org.codehaus.groovy.eclipse.quickfix.test/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.quickfix.test/META-INF/MANIFEST.MF
index 5c1ef401af..1918a49dbe 100644
--- a/ide-test/org.codehaus.groovy.eclipse.quickfix.test/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.quickfix.test/META-INF/MANIFEST.MF
@@ -10,8 +10,4 @@ Export-Package: org.codehaus.groovy.eclipse.quickfix.test,
 Import-Package: org.eclipse.core.filesystem
 Require-Bundle: org.codehaus.groovy.eclipse.quickfix;bundle-version="2.9.2",
  org.codehaus.groovy.eclipse.refactoring.test;bundle-version="2.9.2",
- org.codehaus.groovy.eclipse.tests;bundle-version="2.9.2",
- org.eclipse.ui.editors,
- org.eclipse.ui.forms,
- org.eclipse.ui.ide,
- org.eclipse.ui
+ org.codehaus.groovy.eclipse.tests;bundle-version="2.9.2"
diff --git a/ide-test/org.codehaus.groovy.eclipse.refactoring.test/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.refactoring.test/META-INF/MANIFEST.MF
index 6348bf79fa..fac09f8f81 100644
--- a/ide-test/org.codehaus.groovy.eclipse.refactoring.test/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.refactoring.test/META-INF/MANIFEST.MF
@@ -6,8 +6,6 @@ Bundle-Name: Groovy Refactoring Tests
 Bundle-Version: 2.9.2.qualifier
 Export-Package: org.codehaus.groovy.eclipse.refactoring.test,
  org.codehaus.groovy.eclipse.refactoring.test.extract
-Import-Package: org.eclipse.ui.plugin,
- org.eclipse.ui.preferences
 Require-Bundle: org.codehaus.groovy.eclipse.codebrowsing;bundle-version="2.9.2",
  org.codehaus.groovy.eclipse.codebrowsing.test;bundle-version="2.9.2",
  org.codehaus.groovy.eclipse.refactoring;bundle-version="2.9.2",
diff --git a/ide-test/org.codehaus.groovy.eclipse.tests/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.tests/META-INF/MANIFEST.MF
index 5c2208974d..2b6285107f 100644
--- a/ide-test/org.codehaus.groovy.eclipse.tests/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.tests/META-INF/MANIFEST.MF
@@ -20,13 +20,12 @@ Import-Package: org.codehaus.groovy.eclipse.codebrowsing.requestor,
  org.eclipse.jdt.internal.debug.ui.actions,
  org.eclipse.jdt.junit.wizards,
  org.eclipse.jdt.launching,
+ org.eclipse.ui.console,
  org.eclipse.ui.internal.views.log
 Require-Bundle: org.codehaus.groovy.eclipse.ui;bundle-version="2.9.2";visibility:=reexport,
  org.eclipse.jdt.groovy.core.tests.builder;bundle-version="3.3.100";visibility:=reexport,
- org.eclipse.jface;visibility:=reexport,
- org.eclipse.ui.console,
- org.eclipse.ui.editors,
- org.eclipse.ui.forms,
- org.eclipse.ui.ide,
- org.eclipse.ui
+ org.eclipse.ui.editors;visibility:=reexport,
+ org.eclipse.ui.forms;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport,
+ org.eclipse.ui;visibility:=reexport
 Eclipse-BundleShape: dir