diff --git a/ChangeLog b/ChangeLog
index 814b05c707..7259267d18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-01  Florian Weimer  <fweimer@redhat.com>
+
+	* malloc/Makefile (tests): Add tst-malloc-usable-tunables for
+	have-tunables only.
+	(tests-static): Add tst-malloc-usable-static-tunables for
+	have-tunables only.
+
 2017-01-01  Joseph Myers  <joseph@codesourcery.com>
 
 	* scripts/config.guess: Update to version 2017-01-01.
diff --git a/malloc/Makefile b/malloc/Makefile
index bbe5083d59..e93b83b57d 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -33,13 +33,16 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
 	 tst-mallocfork2 \
 	 tst-interpose-nothread \
 	 tst-interpose-thread \
-	 tst-malloc-usable-tunables
 
 tests-static := \
 	 tst-interpose-static-nothread \
 	 tst-interpose-static-thread \
 	 tst-malloc-usable-static \
-	 tst-malloc-usable-static-tunables
+
+ifneq (no,$(have-tunables))
+tests += tst-malloc-usable-tunables
+tests-static += tst-malloc-usable-static-tunables
+endif
 
 tests += $(tests-static)
 test-srcs = tst-mtrace