diff --git a/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF
index 3aebaa8ab..6c5154c00 100644
--- a/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.xtext.junit4,
  org.eclipse.xtext.junit4.build,
  org.eclipse.xtext.junit4.formatter;x-friends:="org.eclipse.xtext.xbase.tests",
- org.eclipse.xtext.junit4.internal;x-internal:=true,
+ org.eclipse.xtext.junit4.internal;x-friends:="org.eclipse.xtext.tests,org.eclipse.xtext.junit4.tests",
  org.eclipse.xtext.junit4.logging;x-internal:=true,
  org.eclipse.xtext.junit4.serializer;x-internal:=true,
  org.eclipse.xtext.junit4.smoketest,
diff --git a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/XtextInjectorProvider.java b/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/XtextInjectorProvider.java
similarity index 78%
rename from tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/XtextInjectorProvider.java
rename to plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/XtextInjectorProvider.java
index 214557760..f32ada358 100644
--- a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/XtextInjectorProvider.java
+++ b/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/XtextInjectorProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.xtext.junit4;
+package org.eclipse.xtext.junit4.internal;
 
 import org.eclipse.xtext.XtextStandaloneSetup;
 import org.eclipse.xtext.junit4.GlobalRegistries;
@@ -8,22 +8,22 @@ import org.eclipse.xtext.junit4.IRegistryConfigurator;
 
 import com.google.inject.Injector;
 
-public class XtextInjectorProvider implements IInjectorProvider, IRegistryConfigurator
-{
+/**
+ * @since 2.9
+ */
+public class XtextInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
 
 	protected GlobalStateMemento stateBeforeInjectorCreation;
 	protected GlobalStateMemento stateAfterInjectorCreation;
 	protected Injector injector;
 
-	static
-	{
+	static {
 		GlobalRegistries.initializeDefaults();
 	}
 
-	public Injector getInjector()
-	{
-		if (injector == null)
-		{
+	@Override
+	public Injector getInjector() {
+		if (injector == null) {
 			stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 			this.injector = new XtextStandaloneSetup().createInjectorAndDoEMFRegistration();
 			stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
@@ -31,13 +31,13 @@ public class XtextInjectorProvider implements IInjectorProvider, IRegistryConfig
 		return injector;
 	}
 
-	public void restoreRegistry()
-	{
+	@Override
+	public void restoreRegistry() {
 		stateBeforeInjectorCreation.restoreGlobalState();
 	}
 
-	public void setupRegistry()
-	{
+	@Override
+	public void setupRegistry() {
 		getInjector();
 		stateAfterInjectorCreation.restoreGlobalState();
 	}
diff --git a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/Bug367679Test.java b/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/Bug367679Test.java
index 8f7dd1b47..da3fbaff9 100644
--- a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/Bug367679Test.java
+++ b/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/Bug367679Test.java
@@ -9,8 +9,7 @@ package org.eclipse.xtext.junit4;
 
 import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.xtext.XtextPackage;
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
+import org.eclipse.xtext.junit4.internal.XtextInjectorProvider;
 import org.eclipse.xtext.validation.CompositeEValidator;
 import org.junit.Assert;
 import org.junit.Test;