diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/GrammarProvider.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/GrammarProvider.java
index dd103316e..78bae2d2d 100644
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/GrammarProvider.java
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/service/GrammarProvider.java
@@ -74,4 +74,14 @@ public class GrammarProvider {
 		}
 		return grammar;
 	}
+	
+	/**
+	 * Public for testing purpose.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @since 2.9
+	 */
+	public void setClassLoader(ClassLoader classLoader) {
+		this.classLoader = classLoader;
+	}
 }
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java
index 37847d8e0..c695a1210 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/XtextSerializerTest.java
@@ -45,9 +45,6 @@ public class XtextSerializerTest extends AbstractXtextTests {
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
-		//		StandaloneSetup standaloneSetup = new StandaloneSetup();
-		//		standaloneSetup.setIgnoreBrokenProjectFiles(true);
-		//		standaloneSetup.setPlatformUri("../..");
 		with(new XtextStandaloneSetup());
 		getInjector().injectMembers(this);
 	}
@@ -81,6 +78,7 @@ public class XtextSerializerTest extends AbstractXtextTests {
 				return XtextSerializerTest.this.get(XtextResourceSet.class);
 			}
 		});
+		grammarProvider.setClassLoader(getClass().getClassLoader());
 		TerminalsGrammarAccess gaTerminals = new TerminalsGrammarAccess(grammarProvider);
 		BaseInheritanceTestLanguageGrammarAccess gaBaseInheritanceTestLanguage = new BaseInheritanceTestLanguageGrammarAccess(grammarProvider, gaTerminals);
 		InheritanceTestLanguageGrammarAccess grammarAccess = new InheritanceTestLanguageGrammarAccess(grammarProvider, gaBaseInheritanceTestLanguage, gaTerminals);