diff --git a/tests/Android.mk b/tests/Android.mk
index c1a5eb4..f018d3e 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -7,7 +7,7 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
-src_dirs := src ../TestCommon/src
+src_dirs := src
 res_dirs := res res-common
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
diff --git a/TestCommon/src/com/android/contacts/common/test/FragmentTestActivity.java b/tests/src/com/android/contacts/common/test/FragmentTestActivity.java
similarity index 100%
rename from TestCommon/src/com/android/contacts/common/test/FragmentTestActivity.java
rename to tests/src/com/android/contacts/common/test/FragmentTestActivity.java
diff --git a/TestCommon/src/com/android/contacts/common/test/IntegrationTestUtils.java b/tests/src/com/android/contacts/common/test/IntegrationTestUtils.java
similarity index 100%
rename from TestCommon/src/com/android/contacts/common/test/IntegrationTestUtils.java
rename to tests/src/com/android/contacts/common/test/IntegrationTestUtils.java
diff --git a/TestCommon/src/com/android/contacts/common/test/LaunchPerformanceBase.java b/tests/src/com/android/contacts/common/test/LaunchPerformanceBase.java
similarity index 100%
rename from TestCommon/src/com/android/contacts/common/test/LaunchPerformanceBase.java
rename to tests/src/com/android/contacts/common/test/LaunchPerformanceBase.java
diff --git a/TestCommon/src/com/android/contacts/common/test/mocks/ContactsMockContext.java b/tests/src/com/android/contacts/common/test/mocks/ContactsMockContext.java
similarity index 100%
rename from TestCommon/src/com/android/contacts/common/test/mocks/ContactsMockContext.java
rename to tests/src/com/android/contacts/common/test/mocks/ContactsMockContext.java
diff --git a/TestCommon/src/com/android/contacts/common/test/mocks/ContactsMockPackageManager.java b/tests/src/com/android/contacts/common/test/mocks/ContactsMockPackageManager.java
similarity index 100%
rename from TestCommon/src/com/android/contacts/common/test/mocks/ContactsMockPackageManager.java
rename to tests/src/com/android/contacts/common/test/mocks/ContactsMockPackageManager.java
diff --git a/TestCommon/src/com/android/contacts/common/test/mocks/MockAccountTypeManager.java b/tests/src/com/android/contacts/common/test/mocks/MockAccountTypeManager.java
similarity index 100%
rename from TestCommon/src/com/android/contacts/common/test/mocks/MockAccountTypeManager.java
rename to tests/src/com/android/contacts/common/test/mocks/MockAccountTypeManager.java
diff --git a/TestCommon/src/com/android/contacts/common/test/mocks/MockContactPhotoManager.java b/tests/src/com/android/contacts/common/test/mocks/MockContactPhotoManager.java
similarity index 100%
rename from TestCommon/src/com/android/contacts/common/test/mocks/MockContactPhotoManager.java
rename to tests/src/com/android/contacts/common/test/mocks/MockContactPhotoManager.java
diff --git a/TestCommon/src/com/android/contacts/common/test/mocks/MockContentProvider.java b/tests/src/com/android/contacts/common/test/mocks/MockContentProvider.java
similarity index 100%
rename from TestCommon/src/com/android/contacts/common/test/mocks/MockContentProvider.java
rename to tests/src/com/android/contacts/common/test/mocks/MockContentProvider.java
diff --git a/TestCommon/src/com/android/contacts/common/test/mocks/MockSharedPreferences.java b/tests/src/com/android/contacts/common/test/mocks/MockSharedPreferences.java
similarity index 100%
rename from TestCommon/src/com/android/contacts/common/test/mocks/MockSharedPreferences.java
rename to tests/src/com/android/contacts/common/test/mocks/MockSharedPreferences.java