diff --git a/tests/Android.mk b/tests/Android.mk
index e9ae710..105f5d0 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -33,3 +33,22 @@ LOCAL_PROGUARD_ENABLED := optimization shrinktests
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
+
+# Register as CMTS
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    org.cyanogenmod.platform.sdk \
+    android-support-test
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files, src/)
+
+LOCAL_PACKAGE_NAME := CmtsPlatformSDKTests
+LOCAL_CERTIFICATE := platform
+LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_PROGUARD_ENABLED := optimization shrinktests
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+include $(BUILD_CMTS_PACKAGE)