diff --git a/ChangeLog b/ChangeLog
index 607508d0bd..b417ee785c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-09-10  Siddhesh Poyarekar  <siddhesh@sourceware.org>
 
+	* malloc/Makefile (tests): Remove individual static test names
+	and just add all of tests-static.
+
 	* csu/libc-start.c (__libc_csu_irel): Remove declaration.
 
 2016-09-07  Joseph Myers  <joseph@codesourcery.com>
diff --git a/malloc/Makefile b/malloc/Makefile
index 037e830f31..d79d66f61f 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -33,13 +33,12 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
 	 tst-mallocfork2 \
 	 tst-interpose-nothread \
 	 tst-interpose-thread \
-	 tst-interpose-static-nothread \
-	 tst-interpose-static-thread \
 
 tests-static := \
 	 tst-interpose-static-nothread \
 	 tst-interpose-static-thread \
 
+tests += $(tests-static)
 test-srcs = tst-mtrace
 
 routines = malloc morecore mcheck mtrace obstack \