diff --git a/ChangeLog b/ChangeLog
index 47a3fa04ae..637c1c39bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-08-16  Joseph Myers  <joseph@codesourcery.com>
+
+	* math/libm-test-compat_totalorder.inc (do_test)
+	[TEST_COMPAT (libm, GLIBC_2_25, GLIBC_2_31)]: Change condition to
+	[TEST_COMPAT (libm, COMPAT_VER, GLIBC_2_31)].
+	* math/libm-test-compat_totalordermag.inc (do_test)
+	[TEST_COMPAT (libm, GLIBC_2_25, GLIBC_2_31)]: Likewise.
+
 2019-08-15  Florian Weimer  <fweimer@redhat.com>
 
 	nptl: Move pthread_attr_init implementation into libc.
diff --git a/math/libm-test-compat_totalorder.inc b/math/libm-test-compat_totalorder.inc
index 7ad87342fd..313e9475c9 100644
--- a/math/libm-test-compat_totalorder.inc
+++ b/math/libm-test-compat_totalorder.inc
@@ -44,7 +44,7 @@ compat_totalorder_test (void)
 static void
 do_test (void)
 {
-#if TEST_COMPAT (libm, GLIBC_2_25, GLIBC_2_31)
+#if TEST_COMPAT (libm, COMPAT_VER, GLIBC_2_31)
   compat_totalorder_test ();
 #endif
 }
diff --git a/math/libm-test-compat_totalordermag.inc b/math/libm-test-compat_totalordermag.inc
index 1f82946fbf..5cbe8797a3 100644
--- a/math/libm-test-compat_totalordermag.inc
+++ b/math/libm-test-compat_totalordermag.inc
@@ -44,7 +44,7 @@ compat_totalordermag_test (void)
 static void
 do_test (void)
 {
-#if TEST_COMPAT (libm, GLIBC_2_25, GLIBC_2_31)
+#if TEST_COMPAT (libm, COMPAT_VER, GLIBC_2_31)
   compat_totalordermag_test ();
 #endif
 }