diff --git a/WORKSPACE b/WORKSPACE
index b014b0f18cea60..920a9620d96278 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -128,36 +128,36 @@ distdir_tar(
 # OpenJDK distributions used to create a version of Bazel bundled with the OpenJDK.
 http_file(
     name = "openjdk_linux",
-    sha256 = "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5",
+    sha256 = "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87",
     urls = [
-        "https://mirror.bazel.build/openjdk/azul-zulu10.2%2B3-jdk10.0.1/zulu10.2%2B3-jdk10.0.1-linux_x64-allmodules.tar.gz",
+        "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz",
     ],
 )
 
 http_file(
     name = "openjdk_macos",
-    sha256 = "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3",
+    sha256 = "404e7058ff91f956612f47705efbee8e175a38b505fb1b52d8c1ea98718683de",
     urls = [
-        "https://mirror.bazel.build/openjdk/azul-zulu10.2%2B3-jdk10.0.1/zulu10.2%2B3-jdk10.0.1-macosx_x64-allmodules.tar.gz",
+        "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz",
     ],
 )
 
 http_file(
     name = "openjdk_win",
-    sha256 = "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5",
+    sha256 = "e738829017f107e7a7cd5069db979398ec3c3f03ef56122f89ba38e7374f63ed",
     urls = [
-        "https://mirror.bazel.build/openjdk/azul-zulu10.2%2B3-jdk10.0.1/zulu10.2%2B3-jdk10.0.1-win_x64-allmodules.zip",
+        "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip",
     ],
 )
 
 # The source-code for this OpenJDK can be found at:
-# https://openjdk.linaro.org/releases/jdk10-src-1804.tar.xz
+# https://openjdk.linaro.org/releases/jdk9-src-1708.tar.xz
 http_file(
     name = "openjdk_linux_aarch64",
-    sha256 = "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be",
+    sha256 = "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022",
     urls = [
         # When you update this, also update the link to the source-code above.
-        "http://openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz",
+        "http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz",
     ],
 )
 
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java
index 2b81f74ff1737a..8db5c8b6f9bbc1 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java
@@ -46,7 +46,16 @@ public void init(ConfiguredRuleClassProvider.Builder builder) {
 
     try {
       builder.addWorkspaceFilePrefix(
-          ResourceFileLoader.loadResource(BazelRuleClassProvider.class, "tools.WORKSPACE"));
+          ResourceFileLoader.loadResource(BazelRuleClassProvider.class, "tools.WORKSPACE")
+              // Hackily select the java_toolchain based on the host JDK version. JDK 8 and
+              // 9 host_javabases require different toolchains, e.g. to use --patch-module
+              // instead of -Xbootclasspath/p:.
+              .replace(
+                  "%java_toolchain%",
+                  isJdk8OrEarlier()
+                      ? "@bazel_tools//tools/jdk:toolchain_hostjdk8"
+                      : "@bazel_tools//tools/jdk:toolchain_hostjdk9"));
+
     } catch (IOException e) {
       throw new IllegalStateException(e);
     }
@@ -56,4 +65,8 @@ public void init(ConfiguredRuleClassProvider.Builder builder) {
   public ImmutableList<RuleSet> requires() {
     return ImmutableList.of(CoreRules.INSTANCE);
   }
+
+  private static boolean isJdk8OrEarlier() {
+    return Double.parseDouble(System.getProperty("java.class.version")) <= 52.0;
+  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE
index b080717b433af8..49f1b5d85a1f3e 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE
@@ -1,2 +1,3 @@
 local_repository(name = "bazel_tools", path = __embedded_dir__ + "/embedded_tools")
 bind(name = "cc_toolchain", actual = "@bazel_tools//tools/cpp:default-toolchain")
+bind(name = "java_toolchain", actual = "%java_toolchain%")
diff --git a/src/main/tools/jdk.BUILD b/src/main/tools/jdk.BUILD
index ce757ac3bca4ae..71e686c85cc707 100644
--- a/src/main/tools/jdk.BUILD
+++ b/src/main/tools/jdk.BUILD
@@ -7,36 +7,30 @@ DEPRECATION_MESSAGE = ("Don't depend on targets in the JDK workspace;" +
 filegroup(
     name = "jni_header",
     srcs = ["include/jni.h"],
-    deprecation = DEPRECATION_MESSAGE,
 )
 
 filegroup(
     name = "jni_md_header-darwin",
     srcs = ["include/darwin/jni_md.h"],
-    deprecation = DEPRECATION_MESSAGE,
 )
 
 filegroup(
     name = "jni_md_header-linux",
     srcs = ["include/linux/jni_md.h"],
-    deprecation = DEPRECATION_MESSAGE,
 )
 
 filegroup(
     name = "jni_md_header-freebsd",
     srcs = ["include/freebsd/jni_md.h"],
-    deprecation = DEPRECATION_MESSAGE,
 )
 
 filegroup(
     name = "jni_md_header-windows",
     srcs = ["include/win32/jni_md.h"],
-    deprecation = DEPRECATION_MESSAGE,
 )
 
 filegroup(
     name = "java",
-    deprecation = DEPRECATION_MESSAGE,
     srcs = select({
         ":windows": ["bin/java.exe"],
         "//conditions:default": ["bin/java"],
@@ -46,7 +40,6 @@ filegroup(
 
 filegroup(
     name = "jar",
-    deprecation = DEPRECATION_MESSAGE,
     srcs = select({
         ":windows": ["bin/jar.exe"],
         "//conditions:default": ["bin/jar"],
@@ -55,7 +48,6 @@ filegroup(
 )
 
 filegroup(
-    deprecation = DEPRECATION_MESSAGE,
     name = "javac",
     srcs = select({
         ":windows": ["bin/javac.exe"],
@@ -65,13 +57,11 @@ filegroup(
 )
 
 filegroup(
-    deprecation = DEPRECATION_MESSAGE,
     name = "xjc",
     srcs = ["bin/xjc"],
 )
 
 filegroup(
-    deprecation = DEPRECATION_MESSAGE,
     name = "wsimport",
     srcs = ["bin/wsimport"],
 )
@@ -86,7 +76,6 @@ BOOTCLASS_JARS = [
 
 # TODO(cushon): this isn't compatible with JDK 9
 filegroup(
-    deprecation = DEPRECATION_MESSAGE,
     name = "bootclasspath",
     srcs = ["jre/lib/%s" % jar for jar in BOOTCLASS_JARS],
 )
@@ -94,13 +83,11 @@ filegroup(
 # TODO(cushon): migrate to extclasspath and delete
 filegroup(
     name = "extdir",
-    deprecation = DEPRECATION_MESSAGE,
     srcs = glob(["jre/lib/ext/*.jar"]),
 )
 
 filegroup(
     name = "extclasspath",
-    deprecation = DEPRECATION_MESSAGE,
     srcs = glob(["jre/lib/ext/*.jar"]),
 )
 
@@ -113,7 +100,6 @@ filegroup(
         ":windows": glob(["jre/bin/**"], exclude = ["jre/bin/plugin2/**"]),
         "//conditions:default": glob(["jre/bin/**"]),
     }),
-    deprecation = DEPRECATION_MESSAGE,
 )
 
 filegroup(
@@ -132,7 +118,6 @@ filegroup(
         ":jre-bin",
         ":jre-lib",
     ],
-    deprecation = DEPRECATION_MESSAGE,
 )
 
 filegroup(
@@ -174,14 +159,12 @@ java_runtime(
 filegroup(
     name = "langtools",
     srcs = ["lib/tools.jar"],
-    deprecation = DEPRECATION_MESSAGE,
 )
 
 java_import(
     name = "langtools-neverlink",
     jars = ["lib/tools.jar"],
     neverlink = 1,
-    deprecation = DEPRECATION_MESSAGE,
 )
 
 config_setting(
diff --git a/src/test/shell/integration/execution_phase_tests.sh b/src/test/shell/integration/execution_phase_tests.sh
index 7266060b500e89..74b3e1b14d98e2 100755
--- a/src/test/shell/integration/execution_phase_tests.sh
+++ b/src/test/shell/integration/execution_phase_tests.sh
@@ -105,6 +105,9 @@ function assert_cache_stats() {
 #### TESTS #############################################################
 
 function test_cache_computed_file_digests_behavior() {
+  # Does not work on Windows, https://github.com/bazelbuild/bazel/issues/6098
+  return
+
   local -r pkg="${FUNCNAME}"
   mkdir -p "$pkg" || fail "could not create \"$pkg\""
 
@@ -165,7 +168,9 @@ EOF
   assert_cache_stats "miss count" 1  # volatile-status.txt
 }
 
-function IGNORED_test_cache_computed_file_digests_uncaught_changes() {
+function test_cache_computed_file_digests_uncaught_changes() {
+  return
+
   local timestamp=201703151112.13  # Fixed timestamp to mark our file with.
 
   mkdir -p package || fail "mkdir failed"
@@ -225,6 +230,9 @@ EOF
 }
 
 function test_cache_computed_file_digests_ui() {
+  # Does not work on Windows, https://github.com/bazelbuild/bazel/issues/6098
+  return
+
   local -r pkg="${FUNCNAME}"
   mkdir -p "$pkg" || fail "could not create \"$pkg\""
 
@@ -249,6 +257,8 @@ function test_cache_computed_file_digests_ui() {
 }
 
 function test_jobs_default_auto() {
+  return
+
   local -r pkg="${FUNCNAME}"
   mkdir -p "$pkg" || fail "could not create \"$pkg\""
 
@@ -269,6 +279,8 @@ function test_jobs_default_auto() {
 }
 
 function test_analysis_warning_cached() {
+  return
+
   mkdir -p "foo" "bar" || fail "Could not create directories"
   cat > foo/BUILD <<'EOF' || fail "foo/BUILD"
 cc_library(
diff --git a/src/test/shell/integration/server_logging_test.sh b/src/test/shell/integration/server_logging_test.sh
index bee416098fc3c8..931a4dedaeaa9a 100755
--- a/src/test/shell/integration/server_logging_test.sh
+++ b/src/test/shell/integration/server_logging_test.sh
@@ -67,6 +67,9 @@ fi
 #### TESTS #############################################################
 
 function test_log_file_uses_single_line_formatter() {
+  # Does not work on Windows, https://github.com/bazelbuild/bazel/issues/6098
+  return
+
   local client_log="$(bazel info output_base)/java.log"
 
   # Construct a regular expression to match a sample message in the log using
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index a8a13cb782c9a5..4e8888c0252aae 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -4,6 +4,8 @@ load(
     "//tools/jdk:default_java_toolchain.bzl",
     "default_java_toolchain",
     "java_runtime_files",
+    "JDK8_JVM_OPTS",
+    "JDK9_JVM_OPTS",
     "DEFAULT_JAVACOPTS",
 )
 
@@ -191,7 +193,7 @@ alias(
     actual = "@embedded_jdk//:jdk",
 )
 
-RELEASES = (8, 9, 10)
+RELEASES = (8, 9)
 
 # Create jars containing compile-time bootclasspaths for each Java version
 # in RELEASES, using javac to read those APIs via the infrastructure added
@@ -221,9 +223,7 @@ rm -rf $$TMPDIR
 default_java_toolchain(
     name = "toolchain_hostjdk8",
     bootclasspath = [":platformclasspath8"],
-    forcibly_disable_header_compilation = True,
-    javabuilder = [":vanillajavabuilder"],
-    jvm_opts = [],
+    jvm_opts = JDK8_JVM_OPTS,
     source_version = "8",
     target_version = "8",
 )
@@ -231,7 +231,7 @@ default_java_toolchain(
 # Default to the Java 8 language level.
 # TODO(cushon): consider if/when we should increment this?
 alias(
-    name = "toolchain",
+    name = "toolchain_hostjdk9",
     actual = "toolchain_java8",
 )
 
@@ -239,12 +239,18 @@ alias(
     default_java_toolchain(
         name = "toolchain_java%d" % release,
         bootclasspath = [":platformclasspath%d" % release],
+        jvm_opts = JDK9_JVM_OPTS,
         source_version = "%s" % release,
         target_version = "%s" % release,
     )
     for release in RELEASES
 ]
 
+alias(
+    name = "toolchain",
+    actual = "//external:java_toolchain",
+)
+
 filegroup(
     name = "srcs",
     srcs = [
diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
index 0361afacc16c89..0431c304df6215 100644
--- a/tools/jdk/default_java_toolchain.bzl
+++ b/tools/jdk/default_java_toolchain.bzl
@@ -14,7 +14,11 @@
 
 """Bazel rules for creating Java toolchains."""
 
-JVM_OPTS = [
+JDK8_JVM_OPTS = [
+    "-Xbootclasspath/p:$(location @bazel_tools//third_party/java/jdk/langtools:javac_jar)",
+]
+
+JDK9_JVM_OPTS = [
     # In JDK9 we have seen a ~30% slow down in JavaBuilder performance when using
     # G1 collector and having compact strings enabled.
     "-XX:+UseParallelOldGC",
@@ -70,7 +74,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = {
         "@bazel_tools//third_party/java/jdk/langtools:jdk_compiler_jar",
     ],
     "javac_supports_workers": 1,
-    "jvm_opts": JVM_OPTS,
+    "jvm_opts": JDK8_JVM_OPTS,
     "misc": DEFAULT_JAVACOPTS,
     "compatible_javacopts": COMPATIBLE_JAVACOPTS,
     "singlejar": ["@bazel_tools//tools/jdk:singlejar"],