diff --git a/tests/Android.mk b/tests/Android.mk
index 9444a01..aad7454 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -1,10 +1,9 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_PRIVILEGED_MODULE := true
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -12,6 +11,4 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PACKAGE_NAME := CyanogenSetupWizardTests
 LOCAL_CERTIFICATE := platform
 
-LOCAL_INSTRUMENTATION_FOR := CyanogenSetupWizard
-
 include $(BUILD_PACKAGE)