diff --git a/ChangeLog b/ChangeLog
index b0e4fb4c82..73777b3b86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-16  Florian Weimer  <fweimer@redhat.com>
+
+	* nptl/Makefile [$(have-cxx-thread_local)] (tests-unsupported):
+	Move tst-thread-exit-clobber ...
+	[$(CXX)] (tests-unsupported): ... to here.
+
 2018-01-16  Florian Weimer  <fweimer@redhat.com>
 
 	* nptl/Makefile (CFLAGS-tst-minstack-throw.o): Compile in C++11
diff --git a/nptl/Makefile b/nptl/Makefile
index 75e21ea90d..0b01e18106 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -460,11 +460,11 @@ endif
 ifeq (,$(CXX))
 # These tests require a C++ compiler and runtime.
 tests-unsupported += tst-cancel24 tst-cancel24-static tst-once5 \
-  tst-minstack-throw
+  tst-thread-exit-clobber tst-minstack-throw
 endif
 # These tests require a C++ compiler and runtime with thread_local support.
 ifneq ($(have-cxx-thread_local),yes)
-tests-unsupported += tst-thread_local1 tst-thread-exit-clobber
+tests-unsupported += tst-thread_local1
 endif
 
 include ../Rules