diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 583f5295a9..6e8e79b05b 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -316,10 +316,7 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += debug.atrace.tags.enableflags=0
 # Packages included only for eng or userdebug builds, previously debug tagged
 PRODUCT_PACKAGES_DEBUG := \
     adb_keys \
-    apex.test.key \
     arping \
-    com.android.apex.test_package.key \
-    com.android.apex.test_package.preinstall.key \
     iotop \
     iw \
     logpersist.start \