diff --git a/javatests/dagger/hilt/android/processor/internal/androidentrypoint/ActivityGeneratorTest.java b/javatests/dagger/hilt/android/processor/internal/androidentrypoint/ActivityGeneratorTest.java
index b6674d4a770..b58c355c864 100644
--- a/javatests/dagger/hilt/android/processor/internal/androidentrypoint/ActivityGeneratorTest.java
+++ b/javatests/dagger/hilt/android/processor/internal/androidentrypoint/ActivityGeneratorTest.java
@@ -16,23 +16,22 @@
 
 package dagger.hilt.android.processor.internal.androidentrypoint;
 
-import static com.google.testing.compile.CompilationSubject.assertThat;
-import static dagger.hilt.android.testing.compile.HiltCompilerTests.compiler;
-
-import com.google.testing.compile.Compilation;
-import com.google.testing.compile.JavaFileObjects;
-import javax.tools.JavaFileObject;
+import androidx.room.compiler.processing.util.Source;
+import dagger.hilt.android.testing.compile.HiltCompilerTests;
+import dagger.testing.golden.GoldenFileRule;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
 public class ActivityGeneratorTest {
+  @Rule public GoldenFileRule goldenFileRule = new GoldenFileRule();
 
   @Test
   public void generate_componentActivity() {
-    JavaFileObject myActivity =
-        JavaFileObjects.forSourceLines(
+    Source myActivity =
+        HiltCompilerTests.javaSource(
             "test.MyActivity",
             "package test;",
             "",
@@ -42,14 +41,13 @@ public void generate_componentActivity() {
             "@AndroidEntryPoint(ComponentActivity.class)",
             "public class MyActivity extends Hilt_MyActivity {",
             "}");
-    Compilation compilation = compiler().compile(myActivity);
-    assertThat(compilation).succeeded();
+    HiltCompilerTests.hiltCompiler(myActivity).compile(subject -> subject.hasErrorCount(0));
   }
 
   @Test
   public void generate_baseHiltComponentActivity() {
-    JavaFileObject baseActivity =
-        JavaFileObjects.forSourceLines(
+    Source baseActivity =
+        HiltCompilerTests.javaSource(
             "test.BaseActivity",
             "package test;",
             "",
@@ -59,8 +57,8 @@ public void generate_baseHiltComponentActivity() {
             "@AndroidEntryPoint(ComponentActivity.class)",
             "public class BaseActivity extends Hilt_BaseActivity {",
             "}");
-    JavaFileObject myActivity =
-        JavaFileObjects.forSourceLines(
+    Source myActivity =
+        HiltCompilerTests.javaSource(
             "test.MyActivity",
             "package test;",
             "",
@@ -70,7 +68,7 @@ public void generate_baseHiltComponentActivity() {
             "@AndroidEntryPoint(BaseActivity.class)",
             "public class MyActivity extends Hilt_MyActivity {",
             "}");
-    Compilation compilation = compiler().compile(baseActivity, myActivity);
-    assertThat(compilation).succeeded();
+    HiltCompilerTests.hiltCompiler(baseActivity, myActivity)
+        .compile(subject -> subject.hasErrorCount(0));
   }
 }
diff --git a/javatests/dagger/hilt/android/processor/internal/androidentrypoint/BUILD b/javatests/dagger/hilt/android/processor/internal/androidentrypoint/BUILD
index 3992ab5f29c..10be1479240 100644
--- a/javatests/dagger/hilt/android/processor/internal/androidentrypoint/BUILD
+++ b/javatests/dagger/hilt/android/processor/internal/androidentrypoint/BUILD
@@ -25,11 +25,14 @@ compiler_test(
         "//java/dagger/hilt/android:android_entry_point",
         "@androidsdk//:platforms/android-32/android.jar",
     ],
+    resources = glob([
+        "goldens/ActivityGeneratorTest_*",
+    ]),
     deps = [
         "//java/dagger/hilt/android/testing/compile",
-        "//third_party/java/compile_testing",
+        "//java/dagger/internal/codegen/xprocessing:xprocessing-testing",
+        "//java/dagger/testing/golden",
         "//third_party/java/junit",
-        "//third_party/java/truth",
     ],
 )