diff --git a/d8_r8/test_modules/tests_java_8/build.gradle.kts b/d8_r8/test_modules/tests_java_8/build.gradle.kts
index 0d7fd0f..99bff59 100644
--- a/d8_r8/test_modules/tests_java_8/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_8/build.gradle.kts
@@ -159,7 +159,6 @@
     from(sourceSets.test.get().java) {
       include("$r8/cf/KeepDeserializeLambdaMethodTest.java")
       include("$r8/desugaring/interfacemethods/methodparameters/I.java")
-      include("$r8/keepanno/api/genericsignature/MyValueBoxClient.java")
     }
   }
 }
diff --git a/d8_r8/test_modules/tests_java_8/keepanno/build.gradle.kts b/d8_r8/test_modules/tests_java_8/keepanno/build.gradle.kts
new file mode 100644
index 0000000..e18a04a
--- /dev/null
+++ b/d8_r8/test_modules/tests_java_8/keepanno/build.gradle.kts
@@ -0,0 +1,25 @@
+// Copyright (c) 2026, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import org.gradle.api.tasks.Copy
+
+// The majority of the build setup is done by tests_java_8.
+java {
+  sourceSets.test.configure {
+    java.srcDir(getRoot().resolveAll("src", "test", "java8", "keepanno"))
+  }
+}
+
+tasks {
+  named<Copy>("processTestResources") {
+    from(sourceSets.test.get().java.srcDirs) {
+      include("com/android/tools/r8/keepanno/api/genericsignature/MyValueBoxClient.java")
+      include("com/android/tools/r8/keepanno/doctests/ForApiDocumentationTest.java")
+      include("com/android/tools/r8/keepanno/doctests/GenericSignaturePrinter.java")
+      include("com/android/tools/r8/keepanno/doctests/MainMethodsDocumentationTest.java")
+      include("com/android/tools/r8/keepanno/doctests/UsesReflectionAnnotationsDocumentationTest.java")
+      include("com/android/tools/r8/keepanno/doctests/UsesReflectionDocumentationTest.java")
+    }
+  }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 435db6c..2ad28b8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -56,6 +56,7 @@
 includeTestProject(":tests_java_8:desugar")
 includeTestProject(":tests_java_8:naming")
 includeTestProject(":tests_java_8:kotlin")
+includeTestProject(":tests_java_8:keepanno")
 includeTestProject(":tests_java_11")
 includeTestProject(":tests_java_17")
 includeTestProject(":tests_java_21")
diff --git a/src/test/java/com/android/tools/r8/keepanno/AccessFlagConfig.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/AccessFlagConfig.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/AccessFlagConfig.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/AccessFlagConfig.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/AnnotationPatternAnyRetentionTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/AnnotationPatternAnyRetentionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/AnnotationPatternAnyRetentionTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/AnnotationPatternAnyRetentionTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/AnnotationPatternClassRetentionTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/AnnotationPatternClassRetentionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/AnnotationPatternClassRetentionTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/AnnotationPatternClassRetentionTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/AnnotationPatternMultipleTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/AnnotationPatternMultipleTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/AnnotationPatternMultipleTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/AnnotationPatternMultipleTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/ArrayPatternsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/ArrayPatternsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/ArrayPatternsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/ArrayPatternsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/CheckOptimizedOutAnnotationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/CheckOptimizedOutAnnotationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/CheckOptimizedOutAnnotationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/CheckOptimizedOutAnnotationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/CheckRemovedAnnotationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/CheckRemovedAnnotationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/CheckRemovedAnnotationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/CheckRemovedAnnotationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/ClassAnnotatedByAnyAnnoConstraintPatternTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/ClassAnnotatedByAnyAnnoConstraintPatternTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/ClassAnnotatedByAnyAnnoConstraintPatternTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/ClassAnnotatedByAnyAnnoConstraintPatternTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/ClassAnnotatedByAnyAnnoPatternTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/ClassAnnotatedByAnyAnnoPatternTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/ClassAnnotatedByAnyAnnoPatternTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/ClassAnnotatedByAnyAnnoPatternTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/ClassAnnotatedByPatternsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/ClassAnnotatedByPatternsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/ClassAnnotatedByPatternsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/ClassAnnotatedByPatternsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/ClassAnnotatedBySingleAnnotationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/ClassAnnotatedBySingleAnnotationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/ClassAnnotatedBySingleAnnotationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/ClassAnnotatedBySingleAnnotationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/ClassNameStringPatternsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/ClassNameStringPatternsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/ClassNameStringPatternsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/ClassNameStringPatternsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/FieldNameStringPatternsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/FieldNameStringPatternsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/FieldNameStringPatternsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/FieldNameStringPatternsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/FieldPatternsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/FieldPatternsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/FieldPatternsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/FieldPatternsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnFieldsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAccessFlagsOnFieldsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnFieldsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAccessFlagsOnFieldsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMembersTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAccessFlagsOnMembersTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMembersTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAccessFlagsOnMembersTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMethodsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAccessFlagsOnMethodsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMethodsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAccessFlagsOnMethodsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAccessVisibilityFlagsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAccessVisibilityFlagsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepAccessVisibilityFlagsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAccessVisibilityFlagsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAnnoInstanceOfTargetTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnoInstanceOfTargetTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepAnnoInstanceOfTargetTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnoInstanceOfTargetTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAnnoParameters.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnoParameters.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepAnnoParameters.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnoParameters.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBase.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnoTestBase.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBase.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnoTestBase.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAnnoWithWhyAreYouKeepingTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnoWithWhyAreYouKeepingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepAnnoWithWhyAreYouKeepingTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnoWithWhyAreYouKeepingTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAnnotationViaSuperTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnotationViaSuperTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepAnnotationViaSuperTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepAnnotationViaSuperTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepBindingTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepBindingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepBindingTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepBindingTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepClassApiTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepClassApiTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepClassApiTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepClassApiTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepConjunctiveBindingsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepConjunctiveBindingsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepConjunctiveBindingsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepConjunctiveBindingsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepConjunctiveBindingsWithInlineMembersTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepConjunctiveBindingsWithInlineMembersTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepConjunctiveBindingsWithInlineMembersTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepConjunctiveBindingsWithInlineMembersTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepConjunctiveBindingsWithoutHolderTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepConjunctiveBindingsWithoutHolderTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepConjunctiveBindingsWithoutHolderTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepConjunctiveBindingsWithoutHolderTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepDisjunctiveConsequencesTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepDisjunctiveConsequencesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepDisjunctiveConsequencesTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepDisjunctiveConsequencesTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepEmptyClassTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepEmptyClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepEmptyClassTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepEmptyClassTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepFieldValueApiTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepFieldValueApiTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepFieldValueApiTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepFieldValueApiTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarAnyClassTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepFooIfBarAnyClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarAnyClassTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepFooIfBarAnyClassTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarSameClassTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepFooIfBarSameClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarSameClassTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepFooIfBarSameClassTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepInclusiveInstanceOfTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepInclusiveInstanceOfTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepInclusiveInstanceOfTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepInclusiveInstanceOfTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepInvalidForApiTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepInvalidForApiTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepInvalidForApiTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepInvalidForApiTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepInvalidTargetTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepInvalidTargetTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepInvalidTargetTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepInvalidTargetTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepMainViaBindingTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepMainViaBindingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepMainViaBindingTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepMainViaBindingTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepMembersAccessFlagsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepMembersAccessFlagsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepMembersAccessFlagsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepMembersAccessFlagsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepMembersApiTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepMembersApiTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepMembersApiTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepMembersApiTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepMethodsAccessFlagsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepMethodsAccessFlagsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepMethodsAccessFlagsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepMethodsAccessFlagsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepMethodsEmptyAccessFlagsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepMethodsEmptyAccessFlagsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepMethodsEmptyAccessFlagsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepMethodsEmptyAccessFlagsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepNameAndInstanceOfTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepNameAndInstanceOfTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepNameAndInstanceOfTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepNameAndInstanceOfTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepSameMethodTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepSameMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepSameMethodTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepSameMethodTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepStaticBindingTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepStaticBindingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepStaticBindingTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepStaticBindingTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepTargetClassAndMemberKindTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepTargetClassAndMemberKindTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepTargetClassAndMemberKindTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepTargetClassAndMemberKindTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepTypePatternWithInstanceOfTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepTypePatternWithInstanceOfTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepTypePatternWithInstanceOfTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepTypePatternWithInstanceOfTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepUsedByNativeAnnotationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsedByNativeAnnotationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepUsedByNativeAnnotationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsedByNativeAnnotationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepUsedByReflectionAnnotationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsedByReflectionAnnotationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepUsedByReflectionAnnotationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsedByReflectionAnnotationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionUnsatisfiedTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionUnsatisfiedTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionUnsatisfiedTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionUnsatisfiedTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionFieldAnnotationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsesReflectionFieldAnnotationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionFieldAnnotationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsesReflectionFieldAnnotationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionOnFieldTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsesReflectionOnFieldTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionOnFieldTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/KeepUsesReflectionOnFieldTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/MembersAnnotatedByPatternsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/MembersAnnotatedByPatternsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/MembersAnnotatedByPatternsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/MembersAnnotatedByPatternsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/MethodNameStringPatternsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/MethodNameStringPatternsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/MethodNameStringPatternsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/MethodNameStringPatternsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/MethodPatternsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/MethodPatternsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/MethodPatternsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/MethodPatternsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/UsedByReflectionMemberInlingingAllowed.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/UsedByReflectionMemberInlingingAllowed.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/UsedByReflectionMemberInlingingAllowed.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/UsedByReflectionMemberInlingingAllowed.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/UsedByReflectionWithNonMatchingMemberPatternsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/UsedByReflectionWithNonMatchingMemberPatternsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/UsedByReflectionWithNonMatchingMemberPatternsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/UsedByReflectionWithNonMatchingMemberPatternsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/AnnotationPatternAnyRetentionTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/AnnotationPatternAnyRetentionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/AnnotationPatternAnyRetentionTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/AnnotationPatternAnyRetentionTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/AnnotationPatternClassRetentionTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/AnnotationPatternClassRetentionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/AnnotationPatternClassRetentionTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/AnnotationPatternClassRetentionTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/KeepAnnoTestExtractedRulesBase.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepAnnoTestExtractedRulesBase.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/KeepAnnoTestExtractedRulesBase.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepAnnoTestExtractedRulesBase.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/KeepUnconditionallyKeepTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUnconditionallyKeepTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/KeepUnconditionallyKeepTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUnconditionallyKeepTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationAnyArgsConstructorTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationAnyArgsConstructorTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationAnyArgsConstructorTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationAnyArgsConstructorTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationMultipleConstructorsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationMultipleConstructorsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationMultipleConstructorsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationMultipleConstructorsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationNoArgsConstructorTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationNoArgsConstructorTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationNoArgsConstructorTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionForInstantiationNoArgsConstructorTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionToAccessFieldTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionToAccessFieldTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionToAccessFieldTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionToAccessFieldTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionToAccessMethodTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionToAccessMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionToAccessMethodTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/KeepUsesReflectionToAccessMethodTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/kt/AnyArgsConstructor.kt b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/AnyArgsConstructor.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/kt/AnyArgsConstructor.kt
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/AnyArgsConstructor.kt
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/kt/Fields.kt b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/Fields.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/kt/Fields.kt
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/Fields.kt
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/kt/FieldsPropertyAccess.kt b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/FieldsPropertyAccess.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/kt/FieldsPropertyAccess.kt
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/FieldsPropertyAccess.kt
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/kt/IntAndLongArgsConstructors.kt b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/IntAndLongArgsConstructors.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/kt/IntAndLongArgsConstructors.kt
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/IntAndLongArgsConstructors.kt
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/kt/IntAndLongArgsConstructorsClassName.kt b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/IntAndLongArgsConstructorsClassName.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/kt/IntAndLongArgsConstructorsClassName.kt
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/IntAndLongArgsConstructorsClassName.kt
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/kt/KeptClass.kt b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/KeptClass.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/kt/KeptClass.kt
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/KeptClass.kt
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/kt/Methods.kt b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/Methods.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/kt/Methods.kt
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/Methods.kt
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/kt/MethodsWithDefaultArguments.kt b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/MethodsWithDefaultArguments.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/kt/MethodsWithDefaultArguments.kt
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/MethodsWithDefaultArguments.kt
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructor.kt b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructor.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructor.kt
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructor.kt
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructorClassName.kt b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructorClassName.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructorClassName.kt
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructorClassName.kt
diff --git a/src/test/java/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructorWithoutAnnotation.kt b/src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructorWithoutAnnotation.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructorWithoutAnnotation.kt
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/androidx/kt/OnlyNoArgsConstructorWithoutAnnotation.kt
diff --git a/src/test/java/com/android/tools/r8/keepanno/api/genericsignature/KeepGenericSignaturesApiTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/api/genericsignature/KeepGenericSignaturesApiTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/api/genericsignature/KeepGenericSignaturesApiTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/api/genericsignature/KeepGenericSignaturesApiTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/api/genericsignature/MyOtherValueBox.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/api/genericsignature/MyOtherValueBox.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/api/genericsignature/MyOtherValueBox.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/api/genericsignature/MyOtherValueBox.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/api/genericsignature/MyValueBox.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/api/genericsignature/MyValueBox.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/api/genericsignature/MyValueBox.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/api/genericsignature/MyValueBox.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/api/genericsignature/MyValueBoxClient.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/api/genericsignature/MyValueBoxClient.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/api/genericsignature/MyValueBoxClient.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/api/genericsignature/MyValueBoxClient.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/ast/KeepEdgeAstTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/ast/KeepEdgeAstTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/ast/KeepEdgeAstTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/ast/KeepEdgeAstTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/classpatterns/ClassNamePatternsTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/classpatterns/ClassNamePatternsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/classpatterns/ClassNamePatternsTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/classpatterns/ClassNamePatternsTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/classpatterns/pkg1/A.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/classpatterns/pkg1/A.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/classpatterns/pkg1/A.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/classpatterns/pkg1/A.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/classpatterns/pkg1/B.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/classpatterns/pkg1/B.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/classpatterns/pkg1/B.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/classpatterns/pkg1/B.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/classpatterns/pkg2/A.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/classpatterns/pkg2/A.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/classpatterns/pkg2/A.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/classpatterns/pkg2/A.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/classpatterns/pkg2/B.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/classpatterns/pkg2/B.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/classpatterns/pkg2/B.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/classpatterns/pkg2/B.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/compatissues/BackReferenceIssuesTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/BackReferenceIssuesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/compatissues/BackReferenceIssuesTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/BackReferenceIssuesTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/compatissues/ClassesWithMembersOnFieldsIssuesTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/ClassesWithMembersOnFieldsIssuesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/compatissues/ClassesWithMembersOnFieldsIssuesTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/ClassesWithMembersOnFieldsIssuesTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/compatissues/ClassesWithMembersOnMethodsIssuesTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/ClassesWithMembersOnMethodsIssuesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/compatissues/ClassesWithMembersOnMethodsIssuesTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/ClassesWithMembersOnMethodsIssuesTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/compatissues/DefaultInitClassWithMembersRuleTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/DefaultInitClassWithMembersRuleTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/compatissues/DefaultInitClassWithMembersRuleTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/DefaultInitClassWithMembersRuleTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/compatissues/EmptyClassWithMembersRuleTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/EmptyClassWithMembersRuleTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/compatissues/EmptyClassWithMembersRuleTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/EmptyClassWithMembersRuleTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/compatissues/NonDefaultInitClassWithMembersRuleTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/NonDefaultInitClassWithMembersRuleTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/compatissues/NonDefaultInitClassWithMembersRuleTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/compatissues/NonDefaultInitClassWithMembersRuleTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/doctests/ForApiDocumentationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/ForApiDocumentationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/doctests/ForApiDocumentationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/ForApiDocumentationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/doctests/GenericSignaturePrinter.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/GenericSignaturePrinter.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/doctests/GenericSignaturePrinter.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/GenericSignaturePrinter.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/doctests/MainMethodsDocumentationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/MainMethodsDocumentationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/doctests/MainMethodsDocumentationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/MainMethodsDocumentationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/doctests/SignatureConstraintsDocumentationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/SignatureConstraintsDocumentationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/doctests/SignatureConstraintsDocumentationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/SignatureConstraintsDocumentationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/doctests/UsesReflectionAnnotationsDocumentationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/UsesReflectionAnnotationsDocumentationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/doctests/UsesReflectionAnnotationsDocumentationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/UsesReflectionAnnotationsDocumentationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/doctests/UsesReflectionDocumentationTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/UsesReflectionDocumentationTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/doctests/UsesReflectionDocumentationTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/doctests/UsesReflectionDocumentationTest.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/utils/DocPrinter.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/DocPrinter.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/utils/DocPrinter.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/DocPrinter.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/utils/DocPrinterBase.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/DocPrinterBase.java
similarity index 98%
rename from src/test/java/com/android/tools/r8/keepanno/utils/DocPrinterBase.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/DocPrinterBase.java
index d2c6b45..994a794 100644
--- a/src/test/java/com/android/tools/r8/keepanno/utils/DocPrinterBase.java
+++ b/src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/DocPrinterBase.java
@@ -4,7 +4,7 @@
 
 package com.android.tools.r8.keepanno.utils;
 
-import com.android.tools.r8.examples.sync.Sync.Consumer;
+import java.util.function.Consumer;
 import com.google.common.html.HtmlEscapers;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/java/com/android/tools/r8/keepanno/utils/KeepAnnoMarkdownGenerator.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/KeepAnnoMarkdownGenerator.java
similarity index 96%
rename from src/test/java/com/android/tools/r8/keepanno/utils/KeepAnnoMarkdownGenerator.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/KeepAnnoMarkdownGenerator.java
index 0d746f1..76bc72c 100644
--- a/src/test/java/com/android/tools/r8/keepanno/utils/KeepAnnoMarkdownGenerator.java
+++ b/src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/KeepAnnoMarkdownGenerator.java
@@ -16,8 +16,8 @@
 import com.android.tools.r8.keepanno.utils.KeepItemAnnotationGenerator.Generator;
 import com.android.tools.r8.keepanno.utils.KeepItemAnnotationGenerator.Group;
 import com.android.tools.r8.keepanno.utils.KeepItemAnnotationGenerator.GroupMember;
+import com.android.tools.r8.ToolHelper;
 import com.android.tools.r8.references.ClassReference;
-import com.android.tools.r8.utils.DescriptorUtils;
 import com.android.tools.r8.utils.internal.FileUtils;
 import com.android.tools.r8.utils.internal.StringUtils;
 import com.google.common.collect.ImmutableMap;
@@ -38,7 +38,7 @@
 
   public static void generateMarkdownDoc(Generator generator, Path projectRoot) {
     try {
-      new KeepAnnoMarkdownGenerator(generator, projectRoot)
+      new KeepAnnoMarkdownGenerator(generator)
           .internalGenerateMarkdownDoc(projectRoot);
     } catch (IOException e) {
       throw new RuntimeException(e);
@@ -65,7 +65,7 @@
   private Map<String, String> docReplacements = new HashMap<>();
   private Map<String, String> codeReplacements = new HashMap<>();
 
-  public KeepAnnoMarkdownGenerator(Generator generator, Path projectRoot) {
+  public KeepAnnoMarkdownGenerator(Generator generator) {
     this.generator = generator;
     ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
     // Annotations.
@@ -94,7 +94,6 @@
 
     typeLinkReplacements = builder.build();
     populateCodeAndDocReplacements(
-        projectRoot,
         UsesReflectionDocumentationTest.class,
         UsesReflectionAnnotationsDocumentationTest.class,
         ForApiDocumentationTest.class,
@@ -135,15 +134,9 @@
     }
   }
 
-  private static Path getSourceFileForTestClass(Path projectRoot, Class<?> clazz) {
-    return projectRoot
-        .resolve("src/test/java")
-        .resolve(DescriptorUtils.getClassBinaryName(clazz) + ".java");
-  }
-
-  private void populateCodeAndDocReplacements(Path projectRoot, Class<?>... classes) {
+  private void populateCodeAndDocReplacements(Class<?>... classes) {
     for (Class<?> clazz : classes) {
-      Path sourceFile = getSourceFileForTestClass(projectRoot, clazz);
+      Path sourceFile = ToolHelper.getSourceFileForTestClassFromResources(clazz);
       extractMarkers(sourceFile);
     }
   }
diff --git a/src/test/java/com/android/tools/r8/keepanno/utils/KeepItemAnnotationGenerator.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/KeepItemAnnotationGenerator.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/utils/KeepItemAnnotationGenerator.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/KeepItemAnnotationGenerator.java
diff --git a/src/test/java/com/android/tools/r8/keepanno/utils/KeepItemGeneratedFilesTest.java b/src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/KeepItemGeneratedFilesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/keepanno/utils/KeepItemGeneratedFilesTest.java
rename to src/test/java8/keepanno/com/android/tools/r8/keepanno/utils/KeepItemGeneratedFilesTest.java
diff --git a/src/test/testbase/java/com/android/tools/r8/ToolHelper.java b/src/test/testbase/java/com/android/tools/r8/ToolHelper.java
index c0c7db5..0b5efa2 100644
--- a/src/test/testbase/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/testbase/java/com/android/tools/r8/ToolHelper.java
@@ -2910,10 +2910,22 @@
   }
 
   public static Path getTestFolderForClass(Class<?> clazz) {
-    return Paths.get(ToolHelper.TESTS_DIR)
-        .resolve("java")
-        .resolve(ToolHelper.getFileNameForTestClass(clazz))
-        .getParent();
+    Path file = ToolHelper.getFileNameForTestClass(clazz);
+    Path javaDir = Paths.get(ToolHelper.TESTS_DIR).resolve("java").resolve(file).getParent();
+    if (Files.exists(javaDir)) {
+      return javaDir;
+    }
+    Path java8KeepAnnoDir =
+        Paths.get(ToolHelper.TESTS_DIR).resolve("java8/keepanno").resolve(file).getParent();
+    if (Files.exists(java8KeepAnnoDir)) {
+      return java8KeepAnnoDir;
+    }
+    Path java8KotlinDir =
+        Paths.get(ToolHelper.TESTS_DIR).resolve("java8/kotlin").resolve(file).getParent();
+    if (Files.exists(java8KotlinDir)) {
+      return java8KotlinDir;
+    }
+    return javaDir;
   }
 
   public static Collection<Path> getFilesInTestFolderRelativeToClass(