diff --git a/math/test-double-vlen2.h b/math/test-double-vlen2.h
index 5c2bfe036c..12f37bab85 100644
--- a/math/test-double-vlen2.h
+++ b/math/test-double-vlen2.h
@@ -19,7 +19,9 @@
 #include "test-double.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_double
 #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen2
diff --git a/math/test-double-vlen4.h b/math/test-double-vlen4.h
index 8d9d326080..a28fef367c 100644
--- a/math/test-double-vlen4.h
+++ b/math/test-double-vlen4.h
@@ -19,7 +19,9 @@
 #include "test-double.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_double
 #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen4
diff --git a/math/test-double-vlen8.h b/math/test-double-vlen8.h
index 602fd6eb59..93e4daba2a 100644
--- a/math/test-double-vlen8.h
+++ b/math/test-double-vlen8.h
@@ -19,7 +19,9 @@
 #include "test-double.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_double
 #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen8
diff --git a/math/test-float-vlen16.h b/math/test-float-vlen16.h
index 268c8e67c0..3cdd97dabf 100644
--- a/math/test-float-vlen16.h
+++ b/math/test-float-vlen16.h
@@ -19,7 +19,9 @@
 #include "test-float.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_float
 #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen16
diff --git a/math/test-float-vlen4.h b/math/test-float-vlen4.h
index 1da9f66c4d..76374b98fe 100644
--- a/math/test-float-vlen4.h
+++ b/math/test-float-vlen4.h
@@ -19,7 +19,9 @@
 #include "test-float.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_float
 #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen4
diff --git a/math/test-float-vlen8.h b/math/test-float-vlen8.h
index b44ed1c5b3..b44d00e0ac 100644
--- a/math/test-float-vlen8.h
+++ b/math/test-float-vlen8.h
@@ -19,7 +19,9 @@
 #include "test-float.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_float
 #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen8
diff --git a/sysdeps/arm/math-tests.h b/sysdeps/arm/math-tests.h
index d4d68f39c9..9a34902b6a 100644
--- a/sysdeps/arm/math-tests.h
+++ b/sysdeps/arm/math-tests.h
@@ -21,9 +21,6 @@
    support rounding modes, although fesetround succeeds, and do not
    support exceptions.  */
 #ifdef __SOFTFP__
-# define ROUNDING_TESTS_float(MODE)	((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_double(MODE)	((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_long_double(MODE)	((MODE) == FE_TONEAREST)
 # define EXCEPTION_TESTS_float	0
 # define EXCEPTION_TESTS_double	0
 # define EXCEPTION_TESTS_long_double	0
diff --git a/sysdeps/arm/nofpu/math-tests-rounding.h b/sysdeps/arm/nofpu/math-tests-rounding.h
new file mode 100644
index 0000000000..9a3b58c080
--- /dev/null
+++ b/sysdeps/arm/nofpu/math-tests-rounding.h
@@ -0,0 +1,29 @@
+/* Configuration for math tests: rounding mode support.  ARM no-FPU version.
+   Copyright (C) 2013-2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef ARM_NOFPU_MATH_TESTS_ROUNDING_H
+#define ARM_NOFPU_MATH_TESTS_ROUNDING_H 1
+
+/* On systems with VFP support, but where glibc is built for
+   soft-float, the libgcc functions used in libc and libm do not
+   support rounding modes, although fesetround succeeds.  */
+#define ROUNDING_TESTS_float(MODE)	((MODE) == FE_TONEAREST)
+#define ROUNDING_TESTS_double(MODE)	((MODE) == FE_TONEAREST)
+#define ROUNDING_TESTS_long_double(MODE)	((MODE) == FE_TONEAREST)
+
+#endif /* math-tests-rounding.h.  */
diff --git a/sysdeps/generic/math-tests-rounding.h b/sysdeps/generic/math-tests-rounding.h
new file mode 100644
index 0000000000..ccc38bd3a1
--- /dev/null
+++ b/sysdeps/generic/math-tests-rounding.h
@@ -0,0 +1,30 @@
+/* Configuration for math tests: rounding mode support.  Generic version.
+   Copyright (C) 2013-2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _MATH_TESTS_ROUNDING_H
+#define _MATH_TESTS_ROUNDING_H 1
+
+/* Indicate whether to run tests involving a given rounding mode for a
+   given floating-point type, given that fesetround succeeds for that
+   mode.  All are run if fesetround succeeds unless overridden.  */
+#define ROUNDING_TESTS_float(MODE)	1
+#define ROUNDING_TESTS_double(MODE)	1
+#define ROUNDING_TESTS_long_double(MODE)	1
+#define ROUNDING_TESTS_float128(MODE)	1
+
+#endif /* math-tests-rounding.h.  */
diff --git a/sysdeps/generic/math-tests.h b/sysdeps/generic/math-tests.h
index f59a2251ed..2ad83dfc43 100644
--- a/sysdeps/generic/math-tests.h
+++ b/sysdeps/generic/math-tests.h
@@ -36,22 +36,6 @@
 /* Return nonzero value if to run tests involving sNaN values for X.  */
 #define SNAN_TESTS(x) MATH_TESTS_TG (SNAN_TESTS_, , x)
 
-/* Indicate whether to run tests involving a given rounding mode for a
-   given floating-point type, given that fesetround succeeds for that
-   mode.  All are run if fesetround succeeds unless overridden.  */
-#ifndef ROUNDING_TESTS_float
-# define ROUNDING_TESTS_float(MODE)	1
-#endif
-#ifndef ROUNDING_TESTS_double
-# define ROUNDING_TESTS_double(MODE)	1
-#endif
-#ifndef ROUNDING_TESTS_long_double
-# define ROUNDING_TESTS_long_double(MODE)	1
-#endif
-#ifndef ROUNDING_TESTS_float128
-# define ROUNDING_TESTS_float128(MODE)	1
-#endif
-
 #define ROUNDING_TESTS(TYPE, MODE)		\
   MATH_TESTS_TG (ROUNDING_TESTS_, (MODE), TYPE)
 
@@ -93,6 +77,7 @@
 # define EXCEPTION_SET_FORCES_TRAP 0
 #endif
 
+#include <math-tests-rounding.h>
 #include <math-tests-snan.h>
 #include <math-tests-snan-cast.h>
 #include <math-tests-snan-payload.h>
diff --git a/sysdeps/m68k/coldfire/math-tests.h b/sysdeps/m68k/coldfire/math-tests.h
index b05609d45d..a386f6cb06 100644
--- a/sysdeps/m68k/coldfire/math-tests.h
+++ b/sysdeps/m68k/coldfire/math-tests.h
@@ -18,9 +18,6 @@
 
 /* ColdFire soft float does not support exceptions and rounding modes.  */
 #ifndef __mcffpu__
-# define ROUNDING_TESTS_float(MODE)	((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_double(MODE)	((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_long_double(MODE)	((MODE) == FE_TONEAREST)
 # define EXCEPTION_TESTS_float	0
 # define EXCEPTION_TESTS_double	0
 # define EXCEPTION_TESTS_long_double	0
diff --git a/sysdeps/mips/math-tests.h b/sysdeps/mips/math-tests.h
index 8e0b98bfef..79d7405be9 100644
--- a/sysdeps/mips/math-tests.h
+++ b/sysdeps/mips/math-tests.h
@@ -21,9 +21,6 @@
 
 /* MIPS soft float does not support exceptions and rounding modes.  */
 #ifdef __mips_soft_float
-# define ROUNDING_TESTS_float(MODE)	((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_double(MODE)	((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_long_double(MODE)	((MODE) == FE_TONEAREST)
 # define EXCEPTION_TESTS_float	0
 # define EXCEPTION_TESTS_double	0
 # define EXCEPTION_TESTS_long_double	0
diff --git a/sysdeps/nios2/math-tests.h b/sysdeps/nios2/math-tests.h
index a1c2762786..b246827581 100644
--- a/sysdeps/nios2/math-tests.h
+++ b/sysdeps/nios2/math-tests.h
@@ -18,9 +18,6 @@
 
 /* Current Nios II soft-float does not support exceptions or rounding
    modes.  */
-#define ROUNDING_TESTS_float(MODE)	((MODE) == FE_TONEAREST)
-#define ROUNDING_TESTS_double(MODE)	((MODE) == FE_TONEAREST)
-#define ROUNDING_TESTS_long_double(MODE)	((MODE) == FE_TONEAREST)
 #define EXCEPTION_TESTS_float	0
 #define EXCEPTION_TESTS_double	0
 #define EXCEPTION_TESTS_long_double	0
diff --git a/sysdeps/riscv/math-tests.h b/sysdeps/riscv/math-tests.h
index 3db33b0e9a..f4a8f9f5bc 100644
--- a/sysdeps/riscv/math-tests.h
+++ b/sysdeps/riscv/math-tests.h
@@ -29,11 +29,4 @@
 # define EXCEPTION_TESTS_long_double   0
 #endif
 
-/* On soft-float targets we only support the "to nearest" rounding mode.  */
-#ifndef __riscv_flen
-# define ROUNDING_TESTS_float(MODE)		((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_double(MODE)		((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_long_double(MODE)	((MODE) == FE_TONEAREST)
-#endif
-
 #include_next <math-tests.h>
diff --git a/sysdeps/riscv/nofpu/math-tests-rounding.h b/sysdeps/riscv/nofpu/math-tests-rounding.h
new file mode 100644
index 0000000000..97842ce459
--- /dev/null
+++ b/sysdeps/riscv/nofpu/math-tests-rounding.h
@@ -0,0 +1,27 @@
+/* Configuration for math tests: rounding mode support.  RISC-V no-FPU version.
+   Copyright (C) 2014-2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef RISCV_NOFPU_MATH_TESTS_ROUNDING_H
+#define RISCV_NOFPU_MATH_TESTS_ROUNDING_H 1
+
+/* On soft-float targets we only support the "to nearest" rounding mode.  */
+#define ROUNDING_TESTS_float(MODE)		((MODE) == FE_TONEAREST)
+#define ROUNDING_TESTS_double(MODE)		((MODE) == FE_TONEAREST)
+#define ROUNDING_TESTS_long_double(MODE)	((MODE) == FE_TONEAREST)
+
+#endif /* math-tests-rounding.h.  */
