diff --git a/org.eclipse.xtext.testlanguages/.gitignore b/org.eclipse.xtext.testlanguages/.gitignore
index fe99505dc..f3f1c4be1 100644
--- a/org.eclipse.xtext.testlanguages/.gitignore
+++ b/org.eclipse.xtext.testlanguages/.gitignore
@@ -1,2 +1 @@
-bin
-
+.antlr-generator-*.jar
diff --git a/org.eclipse.xtext.tests/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 000000000..52f493ada
--- /dev/null
+++ b/org.eclipse.xtext.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,33 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.generator/src.directory=generator/xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.generator/src.ignore=
+//outlet.DEFAULT_OUTPUT.sourceFolder.generator/xtend-gen.directory=
+//outlet.DEFAULT_OUTPUT.sourceFolder.generator/xtend-gen.ignore=true
+BuilderConfiguration.is_project_specific=true
+autobuilding=true
+eclipse.preferences.version=1
+generateGeneratedAnnotation=false
+generateSuppressWarnings=true
+generatedAnnotationComment=
+includeDateInGenerated=false
+outlet.DEFAULT_OUTPUT.cleanDirectory=false
+outlet.DEFAULT_OUTPUT.cleanupDerived=true
+outlet.DEFAULT_OUTPUT.createDirectory=true
+outlet.DEFAULT_OUTPUT.derived=true
+outlet.DEFAULT_OUTPUT.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.keepLocalHistory=false
+outlet.DEFAULT_OUTPUT.override=true
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.ignore=true
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.ignore=true
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.src.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.suites.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.suites.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.ignore=true
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
+targetJavaVersion=JAVA5
+useJavaCompilerCompliance=true
diff --git a/org.eclipse.xtext.tests/build.gradle b/org.eclipse.xtext.tests/build.gradle
index bb2082cda..7ee029f33 100644
--- a/org.eclipse.xtext.tests/build.gradle
+++ b/org.eclipse.xtext.tests/build.gradle
@@ -21,6 +21,11 @@ sourceSets.test.java {
 	srcDir 'suites'
 }
 
+sourceSets.mwe2.java {
+	srcDir 'generator/src'
+	srcDir 'generator/xtend-gen'
+}
+
 test {
 	exclude 'org.eclipse.xtext.serializer.contextFinderTest.NestedTypeRecursiveTest.class'
 	exclude '**/*Suite.class'
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ImportURIScopingFragment2.xtend b/org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ImportURIScopingFragment2.xtend
similarity index 100%
rename from org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ImportURIScopingFragment2.xtend
rename to org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ImportURIScopingFragment2.xtend
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/TestsEMFGeneratorFragment.xtend b/org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/TestsEMFGeneratorFragment.xtend
similarity index 100%
rename from org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/TestsEMFGeneratorFragment.xtend
rename to org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/TestsEMFGeneratorFragment.xtend
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/EcoreQualifiedNameProvider.java b/org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/EcoreQualifiedNameProvider.java
similarity index 100%
rename from org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/EcoreQualifiedNameProvider.java
rename to org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/EcoreQualifiedNameProvider.java
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/EcoreResourceDescriptionStrategy.java b/org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/EcoreResourceDescriptionStrategy.java
similarity index 100%
rename from org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/EcoreResourceDescriptionStrategy.java
rename to org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/EcoreResourceDescriptionStrategy.java
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/EcoreRuntimeModule.java b/org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/EcoreRuntimeModule.java
similarity index 100%
rename from org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/EcoreRuntimeModule.java
rename to org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/EcoreRuntimeModule.java
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/EcoreSupport.java b/org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/EcoreSupport.java
similarity index 100%
rename from org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/EcoreSupport.java
rename to org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/EcoreSupport.java
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/EcoreSupportStandaloneSetup.java b/org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/EcoreSupportStandaloneSetup.java
similarity index 100%
rename from org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/EcoreSupportStandaloneSetup.java
rename to org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/EcoreSupportStandaloneSetup.java
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/NsURIQualifiedNameProvider.java b/org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/NsURIQualifiedNameProvider.java
similarity index 100%
rename from org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/ecore/NsURIQualifiedNameProvider.java
rename to org.eclipse.xtext.tests/generator/src/org/eclipse/xtext/tests/ecore/NsURIQualifiedNameProvider.java
diff --git a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/tests/ImportURIScopingFragment2.java b/org.eclipse.xtext.tests/generator/xtend-gen/org/eclipse/xtext/tests/ImportURIScopingFragment2.java
similarity index 100%
rename from org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/tests/ImportURIScopingFragment2.java
rename to org.eclipse.xtext.tests/generator/xtend-gen/org/eclipse/xtext/tests/ImportURIScopingFragment2.java
diff --git a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/tests/TestsEMFGeneratorFragment.java b/org.eclipse.xtext.tests/generator/xtend-gen/org/eclipse/xtext/tests/TestsEMFGeneratorFragment.java
similarity index 100%
rename from org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/tests/TestsEMFGeneratorFragment.java
rename to org.eclipse.xtext.tests/generator/xtend-gen/org/eclipse/xtext/tests/TestsEMFGeneratorFragment.java