diff --git a/libs/ui/tests/Android.mk b/libs/ui/tests/Android.mk
index 018f18d..1ff896b 100644
--- a/libs/ui/tests/Android.mk
+++ b/libs/ui/tests/Android.mk
@@ -5,7 +5,7 @@
 test_src_files := \
     InputDispatcher_test.cpp
 
-LOCAL_SHARED_LIBRARIES := \
+shared_libraries := \
 	libcutils \
 	libutils \
 	libEGL \
@@ -16,21 +16,26 @@
 	libui \
 	libstlport
 
-LOCAL_STATIC_LIBRARIES := \
+static_libraries := \
 	libgtest \
 	libgtest_main
 
-LOCAL_C_INCLUDES := \
+c_includes := \
     bionic \
     bionic/libstdc++/include \
     external/gtest/include \
     external/stlport/stlport
 
-LOCAL_MODULE_TAGS := eng tests
+module_tags := eng tests
 
 $(foreach file,$(test_src_files), \
+    $(eval include $(CLEAR_VARS)) \
+    $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
+    $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \
+    $(eval LOCAL_C_INCLUDES := $(c_includes)) \
     $(eval LOCAL_SRC_FILES := $(file)) \
     $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
+    $(eval LOCAL_MODULE_TAGS := $(module_tags)) \
     $(eval include $(BUILD_EXECUTABLE)) \
 )
 
diff --git a/libs/utils/tests/Android.mk b/libs/utils/tests/Android.mk
index 45e8061..92ebfd7 100644
--- a/libs/utils/tests/Android.mk
+++ b/libs/utils/tests/Android.mk
@@ -5,18 +5,18 @@
 test_src_files := \
 	PollLoop_test.cpp
 
-LOCAL_SHARED_LIBRARIES := \
+shared_libraries := \
 	libz \
 	liblog \
 	libcutils \
 	libutils \
 	libstlport
 
-LOCAL_STATIC_LIBRARIES := \
+static_libraries := \
 	libgtest \
 	libgtest_main
 
-LOCAL_C_INCLUDES := \
+c_includes := \
     external/zlib \
     external/icu4c/common \
     bionic \
@@ -24,10 +24,15 @@
     external/gtest/include \
     external/stlport/stlport
 
-LOCAL_MODULE_TAGS := eng tests
+module_tags := eng tests
 
 $(foreach file,$(test_src_files), \
+    $(eval include $(CLEAR_VARS)) \
+    $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
+    $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \
+    $(eval LOCAL_C_INCLUDES := $(c_includes)) \
     $(eval LOCAL_SRC_FILES := $(file)) \
     $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
+    $(eval LOCAL_MODULE_TAGS := $(module_tags)) \
     $(eval include $(BUILD_EXECUTABLE)) \
 )