diff --git a/core/main.mk b/core/main.mk
index da94e0657..2c4f21a31 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1000,11 +1000,13 @@ target-native-tests : native-target-tests
 tests : host-tests target-tests
 
 # To catch more build breakage, check build tests modules in eng and userdebug builds.
+ifneq ($(ANDROID_NO_TEST_CHECK),true)
 ifneq ($(TARGET_BUILD_PDK),true)
 ifneq ($(filter eng userdebug,$(TARGET_BUILD_VARIANT)),)
 droidcore : target-tests host-tests
 endif
 endif
+endif
 
 .PHONY: lintall