--- a/Makefile.am
+++ b/Makefile.am
@@ -1081,7 +1081,7 @@
 
 if WITH_HEAP_CHECKER
 
-TESTS += heap-checker-death_unittest.sh$(EXEEXT)
+#TESTS += heap-checker-death_unittest.sh$(EXEEXT)
 heap_checker_death_unittest_sh_SOURCES = src/tests/heap-checker-death_unittest.sh
 noinst_SCRIPTS += $(top_srcdir)/$(heap_checker_death_unittest_sh_SOURCES)
 heap-checker-death_unittest.sh$(EXEEXT): $(heap_checker_death_unittest_sh_SOURCES) \
@@ -1090,7 +1090,7 @@
 	cp -p $(top_srcdir)/$(heap_checker_death_unittest_sh_SOURCES) $@
 
 # These are sub-programs used by heap-checker_unittest.sh
-TESTS += heap-checker_unittest
+# TESTS += heap-checker_unittest
 HEAP_CHECKER_UNITTEST_INCLUDES = src/config_for_unittests.h \
                                  src/memory_region_map.h \
                                  src/base/commandlineflags.h \
@@ -1190,7 +1190,7 @@
 
 if WITH_HEAP_CHECKER
 
-TESTS += heap-checker_debug_unittest
+#TESTS += heap-checker_debug_unittest
 heap_checker_debug_unittest_SOURCES = $(heap_checker_unittest_SOURCES)
 heap_checker_debug_unittest_CXXFLAGS = $(heap_checker_unittest_CXXFLAGS)
 heap_checker_debug_unittest_LDFLAGS = $(heap_checker_unittest_LDFLAGS)