diff --git a/Android.mk b/Android.mk
index fe39c03..ac19a56 100644
--- a/Android.mk
+++ b/Android.mk
@@ -191,7 +191,7 @@
 
 endef
 
-$(foreach test, $(wildcard art/test/[0-9]*), $(eval $(call declare-test-art-host-run-test,$(notdir $(test)))))
+$(foreach test, $(TEST_ART_RUN_TESTS), $(eval $(call declare-test-art-host-run-test,$(test))))
 
 .PHONY: test-art-host-run-test-default
 test-art-host-run-test-default: $(TEST_ART_HOST_RUN_TEST_DEFAULT_TARGETS)
@@ -254,7 +254,7 @@
 
 endef
 
-$(foreach test, $(wildcard art/test/[0-9]*), $(eval $(call declare-test-art-target-run-test,$(notdir $(test)))))
+$(foreach test, $(TEST_ART_RUN_TESTS), $(eval $(call declare-test-art-target-run-test,$(test))))
 
 .PHONY: test-art-target-run-test
 test-art-target-run-test: $(TEST_ART_TARGET_RUN_TEST_TARGETS)
diff --git a/test/Android.mk b/test/Android.mk
index d15eacf..0c27349 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -190,7 +190,9 @@
 TEST_ART_RUN_TESTS := $(subst $(LOCAL_PATH)/,, $(TEST_ART_RUN_TESTS))
 TEST_ART_TIMING_SENSITIVE_RUN_TESTS := 055-enum-performance
 ifdef dist_goal # disable timing sensitive tests on "dist" builds.
-  $(foreach test, $(TEST_ART_TIMING_SENSITIVE_RUN_TESTS), $(eval TEST_ART_RUN_TESTS := $(filter-out $(test), $(TEST_ART_RUN_TESTS))))
+  $(foreach test, $(TEST_ART_TIMING_SENSITIVE_RUN_TESTS), \
+    $(info Skipping $(test)) \
+    $(eval TEST_ART_RUN_TESTS := $(filter-out $(test), $(TEST_ART_RUN_TESTS))))
 endif
 $(foreach test, $(TEST_ART_RUN_TESTS), $(eval $(call declare-make-art-run-test,$(test))))