diff --git a/tests/Android.mk b/tests/Android.mk
index 7a288ac..d766463 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -17,8 +17,9 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_PACKAGE_NAME := CalendarCommonTests
+LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
+LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit
 
 include $(BUILD_PACKAGE)