diff --git a/tests/Android.mk b/tests/Android.mk
index 4fd947c..c1a5eb4 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -7,11 +7,11 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
-src_dirs := src \
-    ../../ContactsCommon/TestCommon/src
+src_dirs := src ../TestCommon/src
+res_dirs := res res-common
 
-# Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
 
 LOCAL_PACKAGE_NAME := ContactsTests
 
@@ -20,4 +20,11 @@
 LOCAL_SDK_VERSION := current
 LOCAL_MIN_SDK_VERSION := 21
 
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    mockito-target
+
+LOCAL_AAPT_FLAGS := \
+    --auto-add-overlay \
+    --extra-packages com.android.contacts.common.tests
+
 include $(BUILD_PACKAGE)