diff --git a/src/main/java/com/google/devtools/skylark/BUILD b/src/main/java/com/google/devtools/skylark/BUILD
index 6a05f40..4c28ef5 100644
--- a/src/main/java/com/google/devtools/skylark/BUILD
+++ b/src/main/java/com/google/devtools/skylark/BUILD
@@ -6,6 +6,13 @@
 java_binary(
     name = "Skylark",
     srcs = ["Skylark.java"],
+    jvm_flags = [
+        # quiet warnings from com.google.protobuf.UnsafeUtil,
+        # see: https://github.com/google/protobuf/issues/3781
+        # and: https://github.com/bazelbuild/bazel/issues/5599
+        "--add-opens=java.base/java.nio=ALL-UNNAMED",
+        "--add-opens=java.base/java.lang=ALL-UNNAMED",
+    ],
     main_class = "com.google.devtools.skylark.Skylark",
     deps = [
         "//src/main/java/com/google/devtools/build/lib:events",
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 0bf9885..323f4d5 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -41,8 +41,7 @@
         "//third_party/java/jdk/langtools:test-srcs",
         "//tools:srcs",
         "@bazel_skylib//:test_deps",
-        "@local_jdk//:bootclasspath",
-        "@local_jdk//:jdk",
+        "@bazel_tools//tools/jdk:current_java_runtime",
     ] + select({
         # TODO(bazel-team): Once https://github.com/bazelbuild/bazel/issues/2241
         # is resolved, use cc implementation of singlejar on windows
diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD
index 7ab7608..c30f939 100644
--- a/third_party/ijar/test/BUILD
+++ b/third_party/ijar/test/BUILD
@@ -9,10 +9,10 @@
     size = "enormous",
     srcs = ["ijar_test.sh"],
     args = [
-        "../local_jdk/bin/javac",
-        "../local_jdk/bin/java",
-        "../local_jdk/bin/jar",
-        "../local_jdk/bin/javap",
+        "$(JAVABASE)/bin/javac",
+        "$(JAVABASE)/bin/java",
+        "$(JAVABASE)/bin/jar",
+        "$(JAVABASE)/bin/javap",
         "$(location //third_party/ijar)",
         "$(location //tools/jdk:langtools)",
         # We assume unzip and zip to be on the path
@@ -49,6 +49,9 @@
     ],
     shard_count = 5,
     tags = ["zip"],
+    toolchains = [
+        "@bazel_tools//tools/jdk:current_java_runtime",
+    ],
 )
 
 sh_test(
@@ -273,11 +276,6 @@
         ":liblocal_and_anonymous_lib.jar",
         ":local_and_anonymous-interface.jar",
         ":module_info-interface.jar",
-        "//third_party/java/jdk/langtools:javac_jar",
-    ],
-    jvm_flags = [
-        # Simulates how Bazel invokes javac
-        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
     ],
     tags = ["zip"],
     test_class = "IjarTests",
diff --git a/third_party/ijar/test/IjarTests.java b/third_party/ijar/test/IjarTests.java
index 6be9932..0598c1a 100644
--- a/third_party/ijar/test/IjarTests.java
+++ b/third_party/ijar/test/IjarTests.java
@@ -22,7 +22,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.ByteStreams;
-import com.google.devtools.build.java.bazel.BazelJavaCompiler;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -80,7 +79,7 @@
   DiagnosticCollector<JavaFileObject> diagnostics;
 
   private JavaCompiler.CompilationTask makeCompilationTask(String... files) throws IOException {
-    JavaCompiler compiler = BazelJavaCompiler.newInstance();
+    JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
     StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null);
     fileManager.setLocation(StandardLocation.CLASS_PATH,
                             Arrays.asList(new File("third_party/ijar/test/interface_ijar_testlib.jar")));
diff --git a/third_party/ijar/test/ijar_test.sh b/third_party/ijar/test/ijar_test.sh
index d7a5336..98eddae 100755
--- a/third_party/ijar/test/ijar_test.sh
+++ b/third_party/ijar/test/ijar_test.sh
@@ -367,7 +367,7 @@
   # Check that Object.class can be processed
   mkdir -p $TEST_TMPDIR/java/lang
   cp $OBJECT_JAVA $TEST_TMPDIR/java/lang/.
-  $JAVAC $TEST_TMPDIR/java/lang/Object.java || fail "javac failed"
+  $JAVAC -source 8 -target 8 $TEST_TMPDIR/java/lang/Object.java || fail "javac failed"
   $JAR cf $OBJECT_JAR -C $TEST_TMPDIR java/lang/Object.class || fail "jar failed"
 
   $IJAR $OBJECT_JAR $OBJECT_IJAR || fail "ijar failed"