diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
index 3e735a6d3397e8..c80276e9b2a169 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
@@ -95,7 +95,7 @@ protected void useConfiguration(ImmutableMap<String, Object> starlarkOptions, St
     ImmutableList.Builder<String> fullArgs = ImmutableList.builder();
     fullArgs.add("--incompatible_enable_android_toolchain_resolution");
     // Uncomment the below to get more info when tests fail because of toolchain resolution.
-    // fullArgs.add("--toolchain_resolution_debug=tools/android:.*toolchain_type");
+    //  fullArgs.add("--toolchain_resolution_debug=tools/android:.*toolchain_type");
     boolean hasPlatform = false;
     for (String arg : args) {
       if (arg.startsWith("--android_sdk=")) {
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java
index 94189b787f08b0..279aa9df1282a4 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java
@@ -1615,14 +1615,12 @@ public void starlarkJavaToJavaBinaryAttributes() throws Exception {
         "  deps = [':mya'], runtime_deps = [':myb'])");
     assertNoEvents();
 
-    setBuildLanguageOptions("--experimental_google_legacy_api");
     // Test that all bottom jars are on the runtime classpath.
     ConfiguredTarget binary = getConfiguredTarget("//foo:binary");
     assertThat(
             prettyArtifactNames(
                 binary
-                    .get(JavaInfo.PROVIDER)
-                    .getCompilationInfoProvider()
+                    .getProvider(JavaRuntimeClasspathProvider.class)
                     .getRuntimeClasspath()
                     .getSet(Artifact.class)))
         .containsAtLeast("foo/libjl_bottom_for_deps.jar", "foo/libjl_bottom_for_runtime_deps.jar");
@@ -1973,7 +1971,6 @@ public void javaBinary_propagatesDirectNativeLibrariesInJavaInfo() throws Except
         "my_rule(name = 'r', dep = ':jl', cc_dep = ':ccl')",
         "java_binary(name = 'binary', main_class = 'C', srcs = ['java/C.java'], deps = [':r'])");
 
-    setBuildLanguageOptions("--experimental_google_legacy_api");
     ConfiguredTarget testTarget = getConfiguredTarget("//foo:binary");
 
     TemplateExpansionAction action =
@@ -2221,7 +2218,6 @@ public void javaCommonCompileNeverlink() throws Exception {
         "  fragments = ['java']",
         ")");
 
-    setBuildLanguageOptions("--experimental_google_legacy_api");
     ConfiguredTarget target = getConfiguredTarget("//java/test:plugin");
     assertThat(
             actionsTestUtil()
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
index 074e7375728563..48a821fbc3cd5b 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
@@ -351,7 +351,7 @@ public void splitDeps() throws Exception {
         "java/a/BUILD",
         "cc_library(name = 'lib', srcs = ['lib.cc'])",
         "android_binary(name='a', manifest = 'AndroidManifest.xml', deps = [':lib'])");
-    useConfiguration("--fat_apk_cpu=k8,armeabi-v7a", "--experimental_google_legacy_api");
+    useConfiguration("--fat_apk_cpu=k8,armeabi-v7a");
     List<ConfiguredTarget> deps = getConfiguredDeps("//java/a:a", "deps");
     assertThat(deps).hasSize(2);
     ConfiguredTarget dep1 = deps.get(0);