diff --git a/tests/Android.mk b/tests/Android.mk
index 880f62f..fe4c9b2 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -5,10 +5,10 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_CERTIFICATE := shared
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 src_dirs := src \
-    ../../ContactsCommon/TestCommon/src 
+    ../../ContactsCommon/TestCommon/src
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
@@ -17,4 +17,6 @@
 
 LOCAL_INSTRUMENTATION_FOR := Contacts
 
+LOCAL_SDK_VERSION := current
+
 include $(BUILD_PACKAGE)