diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 79ea492fd8..0c7d174b81 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -55,15 +55,15 @@ PRODUCT_PACKAGES := \
 	QuickSearchBox \
 	WidgetPreview \
 	librs_jni \
-	ConnectivityTest \
-	GpsLocationTest \
 	CalendarProvider \
 	Calendar \
 	SmokeTest \
 	SmokeTestApp \
+	EmulatorSmokeTests \
 	rild \
 	LegacyCamera
 
+
 # Define the host tools and libs that are parts of the SDK.
 -include sdk/build/product_sdk.mk
 -include development/build/product_sdk.mk