diff --git a/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 000000000..1eed7b429
--- /dev/null
+++ b/plugins/org.eclipse.xtext.ide/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,23 @@
+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.src.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.src.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.ignore=
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=
+targetJavaVersion=JAVA8
+useJavaCompilerCompliance=false
diff --git a/plugins/org.eclipse.xtext.util/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.eclipse.xtext.util/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 000000000..1eed7b429
--- /dev/null
+++ b/plugins/org.eclipse.xtext.util/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,23 @@
+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.src.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.src.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.ignore=
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=
+targetJavaVersion=JAVA8
+useJavaCompilerCompliance=false
diff --git a/plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 000000000..0fa761e80
--- /dev/null
+++ b/plugins/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,25 @@
+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.src-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.src.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.ignore=
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=
+targetJavaVersion=JAVA8
+useJavaCompilerCompliance=false
diff --git a/plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 000000000..900998655
--- /dev/null
+++ b/plugins/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,25 @@
+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.resources.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.resources.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.src.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.ignore=
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=
+targetJavaVersion=JAVA8
+useJavaCompilerCompliance=false
diff --git a/plugins/org.eclipse.xtext/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.eclipse.xtext/.settings/org.eclipse.xtend.core.Xtend.prefs
index 845e7b53a..0e142ac39 100644
--- a/plugins/org.eclipse.xtext/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/plugins/org.eclipse.xtext/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -21,3 +21,4 @@ outlet.DEFAULT_OUTPUT.sourceFolder.src.ignore=
 outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=
 outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.ignore=
 outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=
+targetJavaVersion=JAVA8
diff --git a/tests/org.eclipse.xtext.ide.tests/.classpath b/tests/org.eclipse.xtext.ide.tests/.classpath
index 84ddc69b8..36f0df03f 100644
--- a/tests/org.eclipse.xtext.ide.tests/.classpath
+++ b/tests/org.eclipse.xtext.ide.tests/.classpath
@@ -11,4 +11,10 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con"
+        path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+        <attributes>
+            <attribute name="maven.pomderived" value="true" />
+        </attributes>
+    </classpathentry>
 </classpath>
diff --git a/tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.xtend.core.Xtend.prefs b/tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 000000000..93f9bdeb0
--- /dev/null
+++ b/tests/org.eclipse.xtext.ide.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,27 @@
+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.src.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.src.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.testlang-src-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.testlang-src-gen.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.testlang-src.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.testlang-src.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.ignore=
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=
+targetJavaVersion=JAVA8
+useJavaCompilerCompliance=false
diff --git a/tests/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF
index 2d10632c1..705f89a07 100644
--- a/tests/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF
@@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.xtext.ide,
  org.junit;bundle-version="4.11.0",
- io.typefox.lsapi,
- io.typefox.lsapi.services
+ io.typefox.lsapi;resolution:=optional,
+ io.typefox.lsapi.services;resolution:=optional
 Import-Package: org.apache.log4j;version="1.2.15"