diff --git a/core/tasks/check_boot_jars/package_whitelist.txt b/core/tasks/check_boot_jars/package_whitelist.txt
index 15b99903cf..82206d6459 100644
--- a/core/tasks/check_boot_jars/package_whitelist.txt
+++ b/core/tasks/check_boot_jars/package_whitelist.txt
@@ -121,7 +121,7 @@ com\.android\..*
 
 
 ###################################################
-# legacy-test.jar
+# android.test.base.jar
 junit\.extensions
 junit\.framework
 android\.test
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index b252349ddb..550c57c543 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -109,7 +109,7 @@ endif
 # The order of PRODUCT_BOOT_JARS matters.
 PRODUCT_BOOT_JARS := \
     $(TARGET_CORE_JARS) \
-    legacy-test \
+    android.test.base \
     ext \
     framework \
     telephony-common \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 3ea5179904..d1779a57f3 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -94,7 +94,7 @@ endif
 # The order matters
 PRODUCT_BOOT_JARS := \
     $(TARGET_CORE_JARS) \
-    legacy-test \
+    android.test.base \
     ext \
     framework \
     telephony-common \
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 6e7038e6dd..c1596d13bf 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -27,7 +27,7 @@ PRODUCT_PACKAGES += \
 
 # Additional mixins to the boot classpath.
 PRODUCT_PACKAGES += \
-    legacy-test \
+    android.test.base \
 
 # Why are we pulling in ext, which is frameworks/base, depending on tagsoup and nist-sip?
 PRODUCT_PACKAGES += \