diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend
index b7dbd4622..c00786123 100644
--- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend
+++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend
@@ -25,20 +25,30 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment {
 	
 	def protected getTestingPackage() {
 		if (useDeprecatedClasses)
-			"org.eclipse.xtext.junit4"
+			getUiTestingPackage()
 		else
 			"org.eclipse.xtext.testing"
 	}
 	
+	protected def String getUiTestingPackage() {
+		"org.eclipse.xtext.junit4"
+	}
+	
 	def protected getXbaseTestingPackage() {
 		if (skipXbaseTestingPackage)
 			return ""
 		if (useDeprecatedClasses)
-			"org.eclipse.xtext.xbase.junit"
+			getXbaseUiTestingPackage()
 		else
 			"org.eclipse.xtext.xbase.testing"
 	}
 	
+	protected def String getXbaseUiTestingPackage() {
+		if (skipXbaseTestingPackage)
+			return ""
+		"org.eclipse.xtext.xbase.junit"
+	}
+	
 	override generate() {
 		if (projectConfig.runtimeTest.manifest !== null) {
 			projectConfig.runtimeTest.manifest => [
@@ -55,6 +65,8 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment {
 				requiredBundles.addAll(
 					testingPackage,
 					xbaseTestingPackage,
+					uiTestingPackage,
+					xbaseUiTestingPackage,
 					"org.eclipse.core.runtime",
 					"org.eclipse.ui.workbench;resolution:=optional"
 				)
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java
index f282aa41b..a2825c617 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java
@@ -42,13 +42,17 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
   protected String getTestingPackage() {
     String _xifexpression = null;
     if (this.useDeprecatedClasses) {
-      _xifexpression = "org.eclipse.xtext.junit4";
+      _xifexpression = this.getUiTestingPackage();
     } else {
       _xifexpression = "org.eclipse.xtext.testing";
     }
     return _xifexpression;
   }
   
+  protected String getUiTestingPackage() {
+    return "org.eclipse.xtext.junit4";
+  }
+  
   protected String getXbaseTestingPackage() {
     String _xblockexpression = null;
     {
@@ -57,7 +61,7 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
       }
       String _xifexpression = null;
       if (this.useDeprecatedClasses) {
-        _xifexpression = "org.eclipse.xtext.xbase.junit";
+        _xifexpression = this.getXbaseUiTestingPackage();
       } else {
         _xifexpression = "org.eclipse.xtext.xbase.testing";
       }
@@ -66,6 +70,17 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
     return _xblockexpression;
   }
   
+  protected String getXbaseUiTestingPackage() {
+    String _xblockexpression = null;
+    {
+      if (this.skipXbaseTestingPackage) {
+        return "";
+      }
+      _xblockexpression = "org.eclipse.xtext.xbase.junit";
+    }
+    return _xblockexpression;
+  }
+  
   @Override
   public void generate() {
     ManifestAccess _manifest = this.getProjectConfig().getRuntimeTest().getManifest();
@@ -91,6 +106,8 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
         CollectionExtensions.<String>addAll(it.getRequiredBundles(), 
           this.getTestingPackage(), 
           this.getXbaseTestingPackage(), 
+          this.getUiTestingPackage(), 
+          this.getXbaseUiTestingPackage(), 
           "org.eclipse.core.runtime", 
           "org.eclipse.ui.workbench;resolution:=optional");
         String _eclipsePluginTestBasePackage = this._xtextGeneratorNaming.getEclipsePluginTestBasePackage(this.getGrammar());