diff --git a/gradle/bootstrap-setup.gradle b/gradle/bootstrap-setup.gradle
index e12f92d23..64f802fdd 100644
--- a/gradle/bootstrap-setup.gradle
+++ b/gradle/bootstrap-setup.gradle
@@ -23,6 +23,8 @@ configurations {
 					useVersion(bootstrapXtendVersion)
 				if (requested.group == 'com.google.inject' && requested.name == 'guice')
 					useVersion(versions.guice)
+				if (requested.group == 'org.eclipse.jdt' && requested.name == 'org.eclipse.jdt.core')
+					useVersion(versions.jdtCore)
 			}
 		}
 		exclude group: 'asm'
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index cc81443f6..84310c236 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -11,10 +11,10 @@ ext.versions = [
 	'xtext_gradle_plugin': '1.0.21',
 	'lsp4j': '0.4.0', // dont forget to adapt IdeProjectDescriptor + Tests
 	'log4j': '1.2.16',
-	'equinoxCommon' : '3.8.0',
-	'equinoxRegistry' : '3.6.100',
-	'eclipseCore': '3.12.0',
-	'eclipseOSGI' : '3.11.2',
+	'equinoxCommon' : '3.9.0',
+	'equinoxRegistry' : '3.7.0',
+	'eclipseCore': '3.13.0',
+	'eclipseOSGI' : '3.12.100',
 	'emfCommon': '[2.10.1,3)',
 	'emfEcore': '[2.10.2,3)',
 	'emfChange': '[2.10.0,3)',
diff --git a/org.eclipse.xtext.testlanguages/build.gradle b/org.eclipse.xtext.testlanguages/build.gradle
index 39e0e931e..8053fd1e2 100644
--- a/org.eclipse.xtext.testlanguages/build.gradle
+++ b/org.eclipse.xtext.testlanguages/build.gradle
@@ -3,7 +3,10 @@ apply from: "${rootDir}/gradle/mwe2-workflows.gradle"
 dependencies {
 	compile project(':org.eclipse.xtext')
 	compile project(':org.eclipse.xtext.testing')
-	compile "org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore"
+	compile "org.eclipse.platform:org.eclipse.equinox.common:$versions.equinoxCommon"
+	compile("org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore") {
+		exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
+	}
 	compile "org.eclipse.emf:org.eclipse.emf.mwe2.runtime:$versions.emfMwe2"
 }
 
diff --git a/org.eclipse.xtext.xtext.generator/build.gradle b/org.eclipse.xtext.xtext.generator/build.gradle
index e22e771b0..57f5489ae 100644
--- a/org.eclipse.xtext.xtext.generator/build.gradle
+++ b/org.eclipse.xtext.xtext.generator/build.gradle
@@ -8,5 +8,12 @@ dependencies {
 	compile "org.eclipse.emf:org.eclipse.emf.mwe.utils:$versions.emfMwe"
 	compile "org.eclipse.emf:org.eclipse.emf.mwe2.lib:$versions.emfMwe2"
 	compile "com.ibm.icu:icu4j:$versions.icu"
-	optional "org.eclipse.jdt:org.eclipse.jdt.core:$versions.jdtCore"
+	compile "org.eclipse.platform:org.eclipse.equinox.common:$versions.equinoxCommon"
+	optional("org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore") {
+		exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
+	}
+	optional("org.eclipse.jdt:org.eclipse.jdt.core:$versions.jdtCore") {
+		exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
+		exclude group: "org.eclipse.platform", module: "org.eclipse.core.runtime"
+	}
 }
diff --git a/org.eclipse.xtext/build.gradle b/org.eclipse.xtext/build.gradle
index 9099fb35c..609febab5 100644
--- a/org.eclipse.xtext/build.gradle
+++ b/org.eclipse.xtext/build.gradle
@@ -12,7 +12,9 @@ dependencies {
 	compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:$versions.emfEcore"
 	compile "com.google.inject:guice:$versions.guice"
 	compile "org.antlr:antlr-runtime:$versions.antlr"
-	optional "org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore"
+	optional("org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore") {
+		exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
+	}
 	optional "org.eclipse.platform:org.eclipse.equinox.registry:$versions.equinoxRegistry"
 	optional "org.eclipse.emf:org.eclipse.emf.mwe.utils:$versions.emfMwe"
 	optional "org.eclipse.xpand:org.eclipse.xtend:$versions.xpand"