diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index f6c0653b385417..4ea44bb410186a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -589,7 +589,7 @@ public static class Options extends FragmentOptions implements Cloneable {
 
     @Option(
         name = "incompatible_java_coverage",
-        defaultValue = "false",
+        defaultValue = "true",
         documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
         effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
         metadataTags = {
diff --git a/src/test/shell/bazel/bazel_coverage_java_test.sh b/src/test/shell/bazel/bazel_coverage_java_test.sh
index b9b6975a60571c..9c94377d26670c 100755
--- a/src/test/shell/bazel/bazel_coverage_java_test.sh
+++ b/src/test/shell/bazel/bazel_coverage_java_test.sh
@@ -113,7 +113,7 @@ EOF
   local coverage_file_path="$( get_coverage_file_path_from_test_log )"
 
   cat <<EOF > result.dat
-SF:com/example/Collatz.java
+SF:src/main/com/example/Collatz.java
 FN:3,com/example/Collatz::<init> ()V
 FN:6,com/example/Collatz::getCollatzFinal (I)I
 FNDA:0,com/example/Collatz::<init> ()V
@@ -201,7 +201,7 @@ EOF
    || echo "Coverage for //:test failed"
 
   cat <<EOF > result.dat
-SF:com/example/Collatz.java
+SF:src/main/com/example/Collatz.java
 FN:3,com/example/Collatz::<init> ()V
 FN:6,com/example/Collatz::getCollatzFinal (I)I
 FNDA:0,com/example/Collatz::<init> ()V
diff --git a/src/test/shell/bazel/bazel_coverage_sh_test.sh b/src/test/shell/bazel/bazel_coverage_sh_test.sh
index 985f45bd78bc9e..d793858d41027d 100755
--- a/src/test/shell/bazel/bazel_coverage_sh_test.sh
+++ b/src/test/shell/bazel/bazel_coverage_sh_test.sh
@@ -132,7 +132,7 @@ EOF
   local coverage_file_path="$( get_coverage_file_path_from_test_log )"
 
   cat <<EOF > result.dat
-SF:com/google/orange/orangeBin.java
+SF:java/com/google/orange/orangeBin.java
 FN:3,com/google/orange/orangeBin::<init> ()V
 FN:5,com/google/orange/orangeBin::main ([Ljava/lang/String;)V
 FNDA:0,com/google/orange/orangeBin::<init> ()V
@@ -146,7 +146,7 @@ DA:7,1
 LH:3
 LF:4
 end_of_record
-SF:com/google/orange/orangeLib.java
+SF:java/com/google/orange/orangeLib.java
 FN:3,com/google/orange/orangeLib::<init> ()V
 FN:6,com/google/orange/orangeLib::print ()V
 FNDA:1,com/google/orange/orangeLib::<init> ()V
@@ -501,7 +501,7 @@ end_of_record"
 
   ############# Assert Java code coverage results
 
-  local coverage_result_orange_bin="SF:com/google/orange/orangeBin.java
+  local coverage_result_orange_bin="SF:java/com/google/orange/orangeBin.java
 FN:2,com/google/orange/orangeBin::<init> ()V
 FN:4,com/google/orange/orangeBin::main ([Ljava/lang/String;)V
 FNDA:0,com/google/orange/orangeBin::<init> ()V
@@ -517,7 +517,7 @@ LF:4
 end_of_record"
   assert_coverage_result "$coverage_result_orange_bin" "$coverage_file_path"
 
-  local coverage_result_orange_lib="SF:com/google/orange/orangeLib.java
+  local coverage_result_orange_lib="SF:java/com/google/orange/orangeLib.java
 FN:2,com/google/orange/orangeLib::<init> ()V
 FN:4,com/google/orange/orangeLib::print ()V
 FNDA:1,com/google/orange/orangeLib::<init> ()V
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index 6257f726afff42..b3962fa33fcd3d 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -220,6 +220,11 @@ java_import(
     jars = ["@remote_java_tools//:java_tools/JacocoCoverage_jarjar_deploy.jar"],
 )
 
+java_import(
+    name = "JacocoCoverage",
+    jars = ["@remote_java_tools//:java_tools/JacocoCoverage_jarjar_deploy.jar"],
+)
+
 java_import(
     name = "TestRunner",
     jars = ["@remote_java_tools//:java_tools/Runner_deploy.jar"],