diff --git a/java/dagger/hilt/android/testing/compile/HiltCompilerTests.java b/java/dagger/hilt/android/testing/compile/HiltCompilerTests.java
index 12126a0c7b0..68062e4f497 100644
--- a/java/dagger/hilt/android/testing/compile/HiltCompilerTests.java
+++ b/java/dagger/hilt/android/testing/compile/HiltCompilerTests.java
@@ -44,8 +44,6 @@
 import dagger.hilt.processor.internal.aliasof.KspAliasOfProcessor;
 import dagger.hilt.processor.internal.definecomponent.DefineComponentProcessor;
 import dagger.hilt.processor.internal.definecomponent.KspDefineComponentProcessor;
-import dagger.hilt.processor.internal.earlyentrypoint.EarlyEntryPointProcessor;
-import dagger.hilt.processor.internal.earlyentrypoint.KspEarlyEntryPointProcessor;
 import dagger.hilt.processor.internal.generatesrootinput.GeneratesRootInputProcessor;
 import dagger.hilt.processor.internal.generatesrootinput.KspGeneratesRootInputProcessor;
 import dagger.hilt.processor.internal.originatingelement.KspOriginatingElementProcessor;
@@ -54,8 +52,6 @@
 import dagger.hilt.processor.internal.root.KspComponentTreeDepsProcessor;
 import dagger.hilt.processor.internal.root.KspRootProcessor;
 import dagger.hilt.processor.internal.root.RootProcessor;
-import dagger.hilt.processor.internal.uninstallmodules.KspUninstallModulesProcessor;
-import dagger.hilt.processor.internal.uninstallmodules.UninstallModulesProcessor;
 import dagger.internal.codegen.ComponentProcessor;
 import dagger.internal.codegen.KspComponentProcessor;
 import dagger.testing.compile.CompilerTests;
@@ -182,11 +178,11 @@ static ImmutableList<Processor> defaultProcessors() {
         new ComponentTreeDepsProcessor(),
         new CustomTestApplicationProcessor(),
         new DefineComponentProcessor(),
-        new EarlyEntryPointProcessor(),
+        new dagger.hilt.processor.internal.earlyentrypoint.EarlyEntryPointProcessor(),
+        new dagger.hilt.processor.internal.uninstallmodules.UninstallModulesProcessor(),
         new GeneratesRootInputProcessor(),
         new OriginatingElementProcessor(),
-        new RootProcessor(),
-        new UninstallModulesProcessor());
+        new RootProcessor());
   }
 
   private static ImmutableList<SymbolProcessorProvider> kspDefaultProcessors() {
@@ -199,11 +195,11 @@ private static ImmutableList<SymbolProcessorProvider> kspDefaultProcessors() {
         new KspComponentTreeDepsProcessor.Provider(),
         new KspCustomTestApplicationProcessor.Provider(),
         new KspDefineComponentProcessor.Provider(),
-        new KspEarlyEntryPointProcessor.Provider(),
+        new dagger.hilt.processor.internal.earlyentrypoint.KspEarlyEntryPointProcessor.Provider(),
+        new dagger.hilt.processor.internal.uninstallmodules.KspUninstallModulesProcessor.Provider(),
         new KspGeneratesRootInputProcessor.Provider(),
         new KspOriginatingElementProcessor.Provider(),
-        new KspRootProcessor.Provider(),
-        new KspUninstallModulesProcessor.Provider());
+        new KspRootProcessor.Provider());
   }
 
   /** Used to compile Hilt sources and inspect the compiled results. */
diff --git a/javatests/dagger/hilt/android/processor/internal/customtestapplication/BUILD b/javatests/dagger/hilt/android/processor/internal/customtestapplication/BUILD
index 54168e776e2..a8d2cb97db9 100644
--- a/javatests/dagger/hilt/android/processor/internal/customtestapplication/BUILD
+++ b/javatests/dagger/hilt/android/processor/internal/customtestapplication/BUILD
@@ -27,7 +27,6 @@ compiler_test(
         "//java/dagger/hilt/android:hilt_android_app",
         "@androidsdk//:platforms/android-32/android.jar",
     ],
-    tags = ["notap"],  # TODO(b/380279766): Re-enable once the bug is fixed.
     deps = [
         "//java/dagger/hilt/android/testing/compile",
         "//third_party/java/guava/collect",
diff --git a/javatests/dagger/hilt/processor/internal/aggregateddeps/BUILD b/javatests/dagger/hilt/processor/internal/aggregateddeps/BUILD
index dbb664977e9..9ddf52a8f2b 100644
--- a/javatests/dagger/hilt/processor/internal/aggregateddeps/BUILD
+++ b/javatests/dagger/hilt/processor/internal/aggregateddeps/BUILD
@@ -34,7 +34,6 @@ compiler_test(
         "//java/dagger/hilt/android/components",
         "@androidsdk//:platforms/android-32/android.jar",
     ],
-    tags = ["notap"],  # TODO(b/380279766): Re-enable once the bug is fixed.
     deps = [
         "//java/dagger/hilt/android/testing/compile",
         "//java/dagger/internal/codegen/xprocessing:xprocessing-testing",
diff --git a/javatests/dagger/hilt/processor/internal/root/BUILD b/javatests/dagger/hilt/processor/internal/root/BUILD
index 4c9906838ab..bdc69dc514e 100644
--- a/javatests/dagger/hilt/processor/internal/root/BUILD
+++ b/javatests/dagger/hilt/processor/internal/root/BUILD
@@ -40,7 +40,6 @@ compiler_test(
         "@maven//:androidx_test_ext_junit",
         "@maven//:androidx_test_core",
     ],
-    tags = ["notap"],  # TODO(b/380279766): Re-enable once the bug is fixed.
     deps = [
         "//java/dagger/hilt/android/testing/compile",
         "//java/dagger/internal/codegen/xprocessing:xprocessing-testing",
diff --git a/test_defs.bzl b/test_defs.bzl
index da0becdb171..15ccf376fb8 100644
--- a/test_defs.bzl
+++ b/test_defs.bzl
@@ -241,6 +241,7 @@ def _GenTestsWithVariants(
 
             for test_file in test_files:
                 test_name = test_file.rsplit(".", 1)[0]
+
                 _GenTestWithVariant(
                     library_rule_type = library_rule_type,
                     test_rule_type = test_rule_type,