diff --git a/tests/Android.mk b/tests/Android.mk
index 86cac8a..78167ec 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -10,9 +10,14 @@
 LOCAL_PACKAGE_NAME := CalendarProviderTests
 LOCAL_COMPATIBILITY_SUITE := device-tests
 
-LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit
 
-LOCAL_JAVA_LIBRARIES := ext android.test.runner
+LOCAL_JAVA_LIBRARIES := \
+    ext \
+    android.test.runner \
+    android.test.base \
+    android.test.mock \
+
 
 LOCAL_INSTRUMENTATION_FOR := CalendarProvider