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 458b8b204..e89fee579 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
@@ -27,11 +27,19 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment {
 			"org.eclipse.xtext.testing"
 	}
 	
+	def protected getXbaseTestingPackage() {
+		if (useDeprecatedClasses)
+			"org.eclipse.xtext.xbase.junit"
+		else
+			"org.eclipse.xtext.xbase.testing"
+	}
+	
 	override generate() {
 		if (projectConfig.runtimeTest.manifest !== null) {
 			projectConfig.runtimeTest.manifest => [
 				requiredBundles.addAll(
 					testingPackage,
+					xbaseTestingPackage,
 					"org.eclipse.xtext.xbase.lib"
 				)
 				exportedPackages.add(grammar.runtimeTestBasePackage+";x-internal=true")
@@ -41,6 +49,7 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment {
 			projectConfig.eclipsePluginTest.manifest => [
 				requiredBundles.addAll(
 					testingPackage,
+					xbaseTestingPackage,
 					"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 1e4b54aa0..65ee68521 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
@@ -46,6 +46,16 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
     return _xifexpression;
   }
   
+  protected String getXbaseTestingPackage() {
+    String _xifexpression = null;
+    if (this.useDeprecatedClasses) {
+      _xifexpression = "org.eclipse.xtext.xbase.junit";
+    } else {
+      _xifexpression = "org.eclipse.xtext.xbase.testing";
+    }
+    return _xifexpression;
+  }
+  
   @Override
   public void generate() {
     ManifestAccess _manifest = this.getProjectConfig().getRuntimeTest().getManifest();
@@ -55,6 +65,7 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
       final Procedure1<ManifestAccess> _function = (ManifestAccess it) -> {
         CollectionExtensions.<String>addAll(it.getRequiredBundles(), 
           this.getTestingPackage(), 
+          this.getXbaseTestingPackage(), 
           "org.eclipse.xtext.xbase.lib");
         String _runtimeTestBasePackage = this._xtextGeneratorNaming.getRuntimeTestBasePackage(this.getGrammar());
         String _plus = (_runtimeTestBasePackage + ";x-internal=true");
@@ -69,6 +80,7 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
       final Procedure1<ManifestAccess> _function_1 = (ManifestAccess it) -> {
         CollectionExtensions.<String>addAll(it.getRequiredBundles(), 
           this.getTestingPackage(), 
+          this.getXbaseTestingPackage(), 
           "org.eclipse.core.runtime", 
           "org.eclipse.ui.workbench;resolution:=optional");
         String _eclipsePluginTestBasePackage = this._xtextGeneratorNaming.getEclipsePluginTestBasePackage(this.getGrammar());