diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index b502bd91b3..79cf602d72 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -112,19 +112,18 @@ dependencies {
 		compile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' )
 		compile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' )
 		compile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' )
-		compile( 'javax:javaee-api:7.0' )
+		compile( 'javax.annotation:jsr250-api:1.0' )
 
 		testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' )
 		testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' )
 		testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' )
 		testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' )
-		testCompile( 'javax:javaee-api:7.0' )
+		testCompile( 'javax.annotation:jsr250-api:1.0' )
 
 		testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' )
 		testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' )
 		testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' )
 		testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' )
-		testRuntime( 'javax:javaee-api:7.0' )
 	}
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 8bc641115f..4a16b583d4 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -23,6 +23,19 @@ configurations {
 }
 
 dependencies {
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Java 9 ftw!
+    if ( JavaVersion.current().isJava9Compatible() ) {
+        xjc( 'com.sun.xml.bind:jaxb-impl:2.2.11' )
+        xjc( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' )
+        xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' )
+        xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' )
+        xjc( 'javax.activation:javax.activation-api:1.2.0' )
+        xjc( 'javax.annotation:jsr250-api:1.0' )
+    }
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     compile( libraries.jpa )
     compile( libraries.javassist )
     // provided until 6.0 when we make it the default and drop Javassist support
diff --git a/tooling/metamodel-generator/hibernate-jpamodelgen.gradle b/tooling/metamodel-generator/hibernate-jpamodelgen.gradle
index e1cf99a035..3e4e57df26 100644
--- a/tooling/metamodel-generator/hibernate-jpamodelgen.gradle
+++ b/tooling/metamodel-generator/hibernate-jpamodelgen.gradle
@@ -20,6 +20,19 @@ dependencies {
 	testCompile libraries.junit
     testCompile libraries.jpa
     testCompile project( ':hibernate-core' )
+
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// Java 9 ftw!
+	if ( JavaVersion.current().isJava9Compatible() ) {
+		xjc( 'com.sun.xml.bind:jaxb-impl:2.2.11' )
+		xjc( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' )
+		xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' )
+		xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' )
+		xjc( 'javax.activation:javax.activation-api:1.2.0' )
+		xjc( 'javax.annotation:jsr250-api:1.0' )
+	}
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 }
 
 sourceSets.main {