diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenDefProvider.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenDefProvider.java
index d1700e3ae..4952a473b 100644
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenDefProvider.java
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AntlrTokenDefProvider.java
@@ -38,15 +38,13 @@ public class AntlrTokenDefProvider implements ITokenDefProvider {
 	
 	protected volatile Map<Integer, String> tokenDefMap;
 	
-//	private static final String TOKEN_COUNT = "Tokens";
-	
 	public Map<Integer, String> getTokenDefMap() {
 		if (antlrTokenFileProvider == null)
 			return Collections.emptyMap();
 		if (tokenDefMap == null) {
 			InputStream tokenFile = antlrTokenFileProvider.getAntlrTokenFile();
 			try {
-				BufferedReader br = new BufferedReader(new InputStreamReader(tokenFile));
+				BufferedReader br = createReader(tokenFile);
 				Map<Integer, String> tokenDefMap = new HashMap<Integer, String>();
 				String line = br.readLine();
 				Pattern pattern = Pattern.compile("(.*)=(\\d+)");
@@ -63,7 +61,7 @@ public class AntlrTokenDefProvider implements ITokenDefProvider {
 						antlrTokenDef = Strings.convertFromJavaString(antlrTokenDef, true);
 						antlrTokenDef = "'" + antlrTokenDef + "'";
 						tokenDefMap.put(antlrTokenType, antlrTokenDef);
-					} else if (antlrTokenDef.startsWith("RULE_") || antlrTokenDef.startsWith("KEYWORD_")) {
+					} else if (antlrTokenDef.startsWith("RULE_") || isKeywordToken(antlrTokenDef)) {
 						tokenDefMap.put(antlrTokenType, antlrTokenDef);
 					}
 					line = br.readLine();
@@ -84,6 +82,20 @@ public class AntlrTokenDefProvider implements ITokenDefProvider {
 		return tokenDefMap;
 	}
 
+	/**
+	 * @since 2.7
+	 */
+	protected boolean isKeywordToken(String antlrTokenDef) {
+		return antlrTokenDef.startsWith("KEYWORD_");
+	}
+
+	/**
+	 * @since 2.7
+	 */
+	protected BufferedReader createReader(InputStream stream) {
+		return new BufferedReader(new InputStreamReader(stream));
+	}
+
 	protected void setTokenDefMap(Map<Integer, String> tokenDefMap) {
 		this.tokenDefMap = ImmutableMap.copyOf(tokenDefMap);
 	}
diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/GenerateTestLanguages.mwe2 b/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/GenerateTestLanguages.mwe2
index 604ba8356..181adb023 100644
--- a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/GenerateTestLanguages.mwe2
+++ b/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/GenerateTestLanguages.mwe2
@@ -5,6 +5,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.testlanguages"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
     bean = StandaloneSetup {
@@ -19,7 +20,7 @@ Workflow {
 		directory = "${runtimeProject}.ui/src-gen"
 	}
 
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		pathUiProject = "${runtimeProject}.ui"
 		projectNameRt = projectName
diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/ExTestLanguageFragments.mwe2 b/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/ExTestLanguageFragments.mwe2
index fdb76c497..6362513af 100644
--- a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/ExTestLanguageFragments.mwe2
+++ b/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/ExTestLanguageFragments.mwe2
@@ -8,13 +8,15 @@ var grammarURI
 var backtrack = false
 var memoize = false
 var classSplitting = true
-var parser = parser.antlr.ex.rt.AntlrGeneratorFragment {
+var lineDelimiter = '\n'
+
+var parser = parser.antlr.ex.rt.AntlrGeneratorFragment auto-inject {
   	options = auto-inject {
   		fieldsPerClass = "100"
   		methodsPerClass = "100"
   	}
 }
-var contentAssist.parser = parser.antlr.ex.ca.ContentAssistParserGeneratorFragment {
+var contentAssist.parser = parser.antlr.ex.ca.ContentAssistParserGeneratorFragment auto-inject {
 	options = auto-inject {
   		fieldsPerClass = "100"
   		methodsPerClass = "100"
diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2 b/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2
index ea00a42d6..d5cd97376 100644
--- a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2
+++ b/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2
@@ -8,13 +8,15 @@ var grammarURI
 var backtrack = false
 var memoize = false
 var classSplitting = true
-var parser = parser.antlr.XtextAntlrGeneratorFragment {
+var lineDelimiter = '\n'
+
+var parser = parser.antlr.XtextAntlrGeneratorFragment auto-inject {
   	options = auto-inject {
   		fieldsPerClass = "100"
   		methodsPerClass = "100"
   	}
 }
-var contentAssist.parser = parser.antlr.XtextAntlrUiGeneratorFragment {
+var contentAssist.parser = parser.antlr.XtextAntlrUiGeneratorFragment auto-inject {
 	options = auto-inject {
   		fieldsPerClass = "100"
   		methodsPerClass = "100"
@@ -27,7 +29,7 @@ LanguageConfig {
 	fragment = grammarAccess.GrammarAccessFragment {}
 
 	// generates Java API for the generated EPackages 
-	fragment = ecore.EcoreGeneratorFragment {
+	fragment = ecore.EcoreGeneratorFragment auto-inject {
 		emfRuntimeVersion = "2.9"
 	}
 
diff --git a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2 b/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2
index 120aee6e8..fa7c09daf 100644
--- a/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2
+++ b/tests/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2
@@ -7,6 +7,7 @@ import org.eclipse.xtext.ui.generator.*
 var grammarURI = "classpath:/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.xtext"
 var fileExtensions = "nojdt"
 var generateXtendStub = true
+var lineDelimiter = '\n'
 
 LanguageConfig auto-inject {
 	uri = grammarURI
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2
index 6f6cb4a7b..d4b4a36ec 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2
@@ -13,6 +13,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -50,10 +51,11 @@ Workflow {
 	component = org.eclipse.emf.mwe2.ecore.EcoreGenerator {
 		genModel = "platform:/resource/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel"
 		srcPath = "foo"
+		lineDelimiter = lineDelimiter
 	}
 	component = org.eclipse.xtext.generator.ecore.GenModelAccessTestGenerator {}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		mergeManifest = false
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2
index 432851f0d..f0849d87c 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2
@@ -15,12 +15,13 @@ var generateDebugData = false
 var graphvizCommand = ""
 var srcGenOnly=true
 var emfRuntimeVersion = "2.9"
+var lineDelimiter = '\n'
 
 CompositeGeneratorFragment {
-	fragment = parser.antlr.XtextAntlrGeneratorFragment {
+	fragment = parser.antlr.XtextAntlrGeneratorFragment auto-inject {
 		options = auto-inject {}
 	}
-	fragment = parser.antlr.DebugAntlrGeneratorFragment {}
+	fragment = parser.antlr.DebugAntlrGeneratorFragment auto-inject {}
 	fragment = resourceFactory.ResourceFactoryFragment { 
 		fileExtensions = file.extensions
 	}
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsEx.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsEx.mwe2
index 7e9f1964a..79d3496e3 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsEx.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsEx.mwe2
@@ -23,9 +23,10 @@ var generateDotDiagram = false
 var graphvizCommand = ""
 var srcGenOnly=true
 var emfRuntimeVersion = "2.9"
+var lineDelimiter = '\n'
 
 CompositeGeneratorFragment {
-	fragment = parser.antlr.ex.rt.AntlrGeneratorFragment {
+	fragment = parser.antlr.ex.rt.AntlrGeneratorFragment auto-inject {
 		options = auto-inject {}
 	}
 	fragment = resourceFactory.ResourceFactoryFragment { 
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsExParseTreeConstructor.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsExParseTreeConstructor.mwe2
index 7d2f5fd1e..084e01e43 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsExParseTreeConstructor.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsExParseTreeConstructor.mwe2
@@ -22,9 +22,10 @@ var backtrackLexer = false
 var generateDotDiagram = false
 var graphvizCommand = ""
 var emfRuntimeVersion = "2.9"
+var lineDelimiter = '\n'
 
 CompositeGeneratorFragment {
-	fragment = parser.antlr.ex.rt.AntlrGeneratorFragment {
+	fragment = parser.antlr.ex.rt.AntlrGeneratorFragment auto-inject {
 		options = auto-inject {}
 	}
 	fragment = resourceFactory.ResourceFactoryFragment { 
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsParseTreeConstructor.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsParseTreeConstructor.mwe2
index 14cf831c2..6832bf851 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsParseTreeConstructor.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsParseTreeConstructor.mwe2
@@ -14,9 +14,10 @@ var memoize = false
 var generateDotDiagram = false
 var graphvizCommand = ""
 var emfRuntimeVersion = "2.9"
+var lineDelimiter = '\n'
 
 CompositeGeneratorFragment {
-	fragment = parser.antlr.XtextAntlrGeneratorFragment {
+	fragment = parser.antlr.XtextAntlrGeneratorFragment auto-inject {
 		options = auto-inject {}
 	}
 	fragment = resourceFactory.ResourceFactoryFragment { 
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2
index 3923a9635..fd4c2e117 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2
@@ -18,9 +18,10 @@ var skipGenerate = false
 var backtrack = false
 var srcGenOnly=true
 var emfRuntimeVersion = "2.9"
+var lineDelimiter = '\n'
 
 CompositeGeneratorFragment {
-	fragment = parser.antlr.XtextAntlrGeneratorFragment {
+	fragment = parser.antlr.XtextAntlrGeneratorFragment auto-inject {
 		options = auto-inject {}
 	}
 	fragment = resourceFactory.ResourceFactoryFragment { 
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2
index 30f0f1be4..8b72db725 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -25,7 +26,7 @@ Workflow {
 		directory="${runtimeProject}/src-gen/org/eclipse/xtext/enumrules"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.mwe2
index e686da70f..3b91bed39 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.Generator
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -26,6 +27,7 @@ Workflow {
 	component = org.eclipse.emf.mwe2.ecore.EcoreGenerator {
 		genModel = "platform:/resource/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/GenModelAccessTest.genmodel"
 		srcPath = "foo"
+		lineDelimiter = lineDelimiter
 	}
 	component = org.eclipse.xtext.generator.ecore.GenModelAccessTestGenerator {}
 }
\ No newline at end of file
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2
index fd08805f0..93b5507b0 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2
@@ -14,13 +14,14 @@ import org.eclipse.xtext.generator.Generator
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
 		platformUri="${runtimeProject}/.."
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2
index 527cbbfea..199cf54af 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.Generator
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -24,7 +25,7 @@ Workflow {
 		directory="${runtimeProject}/src-gen/org/eclipse/xtext/generator/grammarAccess"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2
index 224b7580b..2346e4341 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -36,7 +37,7 @@ Workflow {
 		directory="${runtimeProject}/src-gen/org/eclipse/xtext/grammarinheritance"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2
index 4e42fae90..48f86a20d 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -24,7 +25,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/lexer"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2
index 12012a8e3..8e56163ff 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -24,7 +25,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/lexer"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2
index 2b6cd1dee..11195931f 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -24,7 +25,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/linking"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2
index 10e3c1e54..ab673b43c 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -36,7 +37,7 @@ Workflow {
 		directory="${runtimeProject}/src-gen/org/eclipse/xtext/metamodelreferencing/tests"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2
index 279528811..16060132e 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -24,7 +25,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/parser/antlr"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2
index a650b6627..7c4dbea86 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -24,7 +25,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/parser/assignments"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2
index 475db432e..5948d3056 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -24,7 +25,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/parser/encoding"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2
index 7bd6eeca5..1729ab11e 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -24,7 +25,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/parser/terminalrules"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GenerateUnorderedGroupsTestLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GenerateUnorderedGroupsTestLanguages.mwe2
index c5033af01..63dc3e25c 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GenerateUnorderedGroupsTestLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/unorderedGroups/GenerateUnorderedGroupsTestLanguages.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -24,7 +25,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/parser/unorderedGroups"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2
index bc133cbc0..cd0f0ba0c 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 var generateDotDiagram = true
 //var graphvizCommand = "/opt/local/bin/dot -o %1.pdf -v -T pdf"
@@ -27,7 +28,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/parsetree/formatter"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2
index 46b1ff457..df424365f 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2
@@ -12,13 +12,14 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
 		platformUri="${runtimeProject}/.."
 	}
 
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2
index 6f90d0dd7..6afe11aea 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2
@@ -12,13 +12,14 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
 		platformUri="${runtimeProject}/.."
 	}
 
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2
index 392aa35e1..7c72af99d 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 var generateDotDiagram = true
 //var graphvizCommand = "/opt/local/bin/dot -o %1.pdf -v -T pdf"
@@ -27,7 +28,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/parsetree/reconstr"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2
index 5d58e7408..2b972eefa 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -24,7 +25,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/parsetree/unassignedtext"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2
index ba2efe37a..1980e7be8 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -26,7 +27,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/resource"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
 		
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2
index 89d065c43..d465d8afb 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2
@@ -14,7 +14,10 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
+
 //var graphvizCommand = "/opt/local/bin/dot -o %1.pdf -v -T pdf"
+
 Workflow {
 	bean = StandaloneSetup {
 		platformUri = "${runtimeProject}/.."
@@ -24,7 +27,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/serializer"
 	}
 
-	component = Generator {
+	component = Generator auto-inject {
 		mergeManifest = false
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2
index f55261124..27ea4269d 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 var generateDotDiagram = true
 //var graphvizCommand = "/opt/local/bin/dot -o %1.pdf -v -T pdf"
@@ -27,7 +28,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/validation"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		mergeManifest = false
 		pathRtProject = runtimeProject
 		projectNameRt = projectName
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2 b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2
index 8042f3c58..8534b2e95 100644
--- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.*
 
 var projectName = "org.eclipse.xtext.tests"
 var runtimeProject = "../${projectName}"
+var lineDelimiter = '\n'
 
 Workflow {
 	bean = StandaloneSetup {
@@ -24,7 +25,7 @@ Workflow {
 		directory = "${runtimeProject}/src-gen/org/eclipse/xtext/xtext/ecoreInference"
 	}
 	
-	component = Generator {
+	component = Generator auto-inject {
 		pathRtProject = runtimeProject
 		projectNameRt = projectName