diff --git a/tests/Android.mk b/tests/Android.mk
index 241ff5e..880f62f 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -6,10 +6,12 @@
 LOCAL_CERTIFICATE := shared
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := com.android.contacts.common.test
+
+src_dirs := src \
+    ../../ContactsCommon/TestCommon/src 
 
 # Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 
 LOCAL_PACKAGE_NAME := ContactsTests