diff --git a/Android.mk b/Android.mk
index 91e1270..45a5b8d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,7 +58,6 @@
     com.android.vcard \
     guava \
     libphonenumber \
-    legacy-android-test \
     junit
 
 LOCAL_PACKAGE_NAME := Dialer
diff --git a/tests/Android.mk b/tests/Android.mk
index 07f4f00..53cb238 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -19,6 +19,8 @@
 LOCAL_STATIC_JAVA_LIBRARIES += \
         mockito-target
 
+LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
+
 LOCAL_PACKAGE_NAME := DialerTests
 
 LOCAL_INSTRUMENTATION_FOR := Dialer