diff --git a/Android.common.mk b/Android.common.mk
index 496dfa3..c4f332f 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -34,6 +34,13 @@
 	src/assembler_x86.cc
 endif
 
-TEST_LOCAL_SRC_FILES := \
-	src/assembler_x86_test.cc
+TEST_LOCAL_SRC_FILES :=
 
+ifeq ($(TEST_TARGET_ARCH),arm)
+TEST_LOCAL_SRC_FILES +=
+endif
+
+ifeq ($(TEST_TARGET_ARCH),x86)
+TEST_LOCAL_SRC_FILES += \
+	src/assembler_x86_test.cc
+endif
diff --git a/Android.mk b/Android.mk
index ebca28c..ae77cd5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,6 +18,7 @@
 include $(CLEAR_VARS)
 
 include $(LOCAL_PATH)/Android.libart.mk
+include $(LOCAL_PATH)/Android.test.mk
 include $(LOCAL_PATH)/Android.aexec.mk
 
 ifeq ($(WITH_HOST_DALVIK),true)
diff --git a/Android.test.mk b/Android.test.mk
new file mode 100644
index 0000000..dc3a229
--- /dev/null
+++ b/Android.test.mk
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+local_module_tags := eng tests
+
+TEST_TARGET_ARCH := $(TARGET_ARCH)
+include $(LOCAL_PATH)/Android.common.mk
+local_cpp_extension := $(LOCAL_CPP_EXTENSION)
+
+local_shared_libraries := \
+	libart \
+	libstlport
+
+local_c_includes := \
+	external/stlport/stlport \
+	bionic \
+	bionic/libstdc++/include \
+	dalvik \
+	external/gtest/include
+
+local_static_libraries := \
+	libgtest \
+	libgtest_main
+
+$(foreach file,$(TEST_LOCAL_SRC_FILES), \
+  $(eval include $(CLEAR_VARS)) \
+  $(eval LOCAL_CPP_EXTENSION := $(local_cpp_extension)) \
+  $(eval LOCAL_MODULE := $(notdir $(file:%.cc=%))) \
+  $(eval LOCAL_MODULE_TAGS := $(local_module_tags)) \
+  $(eval LOCAL_SRC_FILES := $(file)) \
+  $(eval LOCAL_C_INCLUDES := $(local_c_includes)) \
+  $(eval LOCAL_STATIC_LIBRARIES := $(local_static_libraries)) \
+  $(eval LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)) \
+  $(eval include $(BUILD_EXECUTABLE)) \
+)