diff --git a/src/test/java/com/google/devtools/build/android/desugar/stringconcat/BUILD b/src/test/java/com/google/devtools/build/android/desugar/stringconcat/BUILD
index ddc2217..4c6c7a9 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/stringconcat/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/stringconcat/BUILD
@@ -12,12 +12,12 @@
     size = "medium",
     srcs = ["IndyStringConcatDesugaringlTest.java"],
     data = [
-        ":string_concat_cases",
+        ":string_concat_cases_srcs",
         "//src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit:android_jar_for_testing",
         "//src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit:jacoco_agent_jar",
     ],
     jvm_flags = [
-        "-Dinput_jar=$(location :string_concat_cases)",
+        "-Dinput_srcs=$(locations :string_concat_cases_srcs)",
         # Required by Desugar#verifyLambdaDumpDirectoryRegistered
         "-Djdk.internal.lambda.dumpProxyClasses=$$(mktemp -d)",
         "-Dandroid_runtime_jar=$(location //src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit:android_jar_for_testing)",
@@ -40,7 +40,7 @@
 
 java_library(
     name = "string_concat_cases",
-    srcs = ["StringConcatTestCases.java"],
+    srcs = [":string_concat_cases_srcs"],
     javacopts = select({
         "//src/tools/android/java/com/google/devtools/build/android/desugar/testing/junit:jdk11-config": [
             "-source 11",
@@ -52,6 +52,11 @@
 )
 
 filegroup(
+    name = "string_concat_cases_srcs",
+    srcs = ["StringConcatTestCases.java"],
+)
+
+filegroup(
     name = "srcs",
     testonly = 0,
     srcs = glob(["*"]),
diff --git a/src/test/java/com/google/devtools/build/android/desugar/stringconcat/IndyStringConcatDesugaringlTest.java b/src/test/java/com/google/devtools/build/android/desugar/stringconcat/IndyStringConcatDesugaringlTest.java
index a029ac9..5e15ba3 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/stringconcat/IndyStringConcatDesugaringlTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/stringconcat/IndyStringConcatDesugaringlTest.java
@@ -29,7 +29,6 @@
 import com.google.devtools.build.android.desugar.testing.junit.RuntimeMethodHandle;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
-import java.nio.file.Paths;
 import java.util.Arrays;
 import org.junit.Rule;
 import org.junit.Test;
@@ -43,18 +42,19 @@
  * within a nest.
  */
 @RunWith(DesugarRunner.class)
+@JdkSuppress(minJdkVersion = JdkVersion.V11)
 public final class IndyStringConcatDesugaringlTest {
 
   @Rule
   public final DesugarRule desugarRule =
       DesugarRule.builder(this, MethodHandles.lookup())
-          .addInputs(Paths.get(System.getProperty("input_jar")))
+          .addSourceInputsFromJvmFlag("input_srcs")
+          .addJavacOptions("-source 11", "-target 11", "-XDstringConcat=indyWithConstants")
           .setWorkingJavaPackage("com.google.devtools.build.android.desugar.stringconcat")
           .addCommandOptions("desugar_indy_string_concat", "true")
           .build();
 
   @Test
-  @JdkSuppress(minJdkVersion = JdkVersion.V11)
   public void invokeDynamicInstr_presentBeforeDesugaring(
       @AsmNode(className = "StringConcatTestCases", memberName = "simplePrefix", round = 0)
           MethodNode simpleStrConcatBeforeDesugar) {
@@ -64,7 +64,6 @@
   }
 
   @Test
-  @JdkSuppress(minJdkVersion = JdkVersion.V11)
   public void invokeDynamicInstr_absentAfterDesugaring(
       @AsmNode(className = "StringConcatTestCases", memberName = "simplePrefix", round = 1)
           MethodNode simpleStrConcatAfterDesugar) {