diff --git a/math/Makefile b/math/Makefile
index cf92aa772d..6156f6e7e1 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -303,26 +303,19 @@ generated += libm-test-ulps.h $(libm-test-c-auto) $(libm-test-c-noauto) \
 	     $(libm-test-c-narrow)
 
 libm-tests-base-normal = $(foreach t,$(test-types),test-$(t))
-libm-tests-base-inline = $(foreach t,$(test-types),test-i$(t))
 libm-tests-base-narrow = $(foreach t,$(test-type-pairs),test-$(t))
-libm-tests-base = $(libm-tests-base-normal) $(libm-tests-base-inline) \
-		  $(libm-vec-tests)
+libm-tests-base = $(libm-tests-base-normal) $(libm-vec-tests)
 libm-tests-normal = $(foreach t,$(libm-tests-base-normal),\
 				$(foreach f,$(libm-test-funcs-all),\
 					    $(t)-$(f)))
-libm-tests-inline = $(foreach t,$(libm-tests-base-inline),\
-				$(foreach f,$(libm-test-funcs-all),\
-					    $(t)-$(f)))
 libm-tests-narrow = $(foreach t,$(libm-tests-base-narrow),\
 				$(foreach f,$(libm-test-funcs-narrow),\
 					    $(t)-$(f)))
 libm-tests-vector = $(foreach t,$(libmvec-tests),\
 				$(foreach f,$($(t)-funcs),test-$(t)-$(f)))
-libm-tests = $(libm-tests-normal) $(libm-tests-inline) \
-	     $(libm-tests-narrow) $(libm-tests-vector)
+libm-tests = $(libm-tests-normal) $(libm-tests-narrow) $(libm-tests-vector)
 libm-tests-compat = $(foreach t,$(libm-tests-base-normal) \
-				$(libm-tests-base-finite) \
-				$(libm-tests-base-inline),\
+				$(libm-tests-base-finite),\
 				$(foreach f,$(libm-test-funcs-compat),\
 					    $(t)-$(f)))
 libm-tests-for-type = $(foreach f,$(libm-test-funcs-all),\
@@ -417,7 +410,6 @@ CFLAGS-test-float-vlen16-wrappers.c += $(float-vlen16-arch-ext-cflags)
 # validated.
 libm-test-no-inline-cflags = -fno-inline -ffloat-store -fno-builtin \
 			     -fsignaling-nans
-libm-test-inline-cflags = $(libm-test-fast-math-cflags)
 CFLAGS-test-tgmath.c += -fno-builtin
 # The following testcase uses very long lines (>3 million), so it may take a
 # while to compile it. See: http://llvm.org/bugs/show_bug.cgi?id=14106 and
@@ -493,23 +485,11 @@ $(foreach t,$(libm-tests-normal),$(objpfx)$(t).c): $(objpfx)test-%.c:
 	( \
 	  echo "#include <test-$$type.h>"; \
 	  echo "#include <test-math-exceptions.h>"; \
-	  echo "#include <test-math-no-inline.h>"; \
 	  echo "#include <test-math-errno.h>"; \
 	  echo "#include <test-math-scalar.h>"; \
 	  echo "#include <libm-test-$$func.c>"; \
 	) > $@
 
-$(foreach t,$(libm-tests-inline),$(objpfx)$(t).c): $(objpfx)test-i%.c:
-	type_func=$*; \
-	type=$${type_func%%-*}; \
-	func=$${type_func#*-}; \
-	( \
-	  echo "#include <test-$$type.h>"; \
-	  echo "#include <test-math-inline.h>"; \
-	  echo "#include <test-math-scalar.h>"; \
-	  echo "#include <libm-test-$$func.c>"; \
-	) > $@
-
 $(foreach t,$(libm-tests-narrow),$(objpfx)$(t).c): $(objpfx)test-%.c:
 	type_pair_func=$*; \
 	type_pair=$${type_pair_func%-*}; \
@@ -520,7 +500,6 @@ $(foreach t,$(libm-tests-narrow),$(objpfx)$(t).c): $(objpfx)test-%.c:
 	  echo "#include <test-$$ret_type.h>"; \
 	  echo "#include <test-arg-$$arg_type.h>"; \
 	  echo "#include <test-math-exceptions.h>"; \
-	  echo "#include <test-math-no-inline.h>"; \
 	  echo "#include <test-math-errno.h>"; \
 	  echo "#include <test-math-narrow.h>"; \
 	  echo "#include <libm-test-narrow-$$func.c>"; \
@@ -569,13 +548,6 @@ endef
 object-suffixes-left := $(libm-tests-base-normal)
 include $(o-iterator)
 
-define o-iterator-doit
-$(foreach f,$(libm-test-funcs-all),\
-	    $(objpfx)$(o)-$(f).o): CFLAGS += $(libm-test-inline-cflags)
-endef
-object-suffixes-left := $(libm-tests-base-inline)
-include $(o-iterator)
-
 define o-iterator-doit
 $(foreach f,$(libm-test-funcs-narrow),\
 	    $(objpfx)$(o)-$(f).o): CFLAGS += $(libm-test-no-inline-cflags)
diff --git a/math/gen-libm-test.py b/math/gen-libm-test.py
index 0142c0f332..4750b06a27 100755
--- a/math/gen-libm-test.py
+++ b/math/gen-libm-test.py
@@ -94,7 +94,6 @@ BEAUTIFY_MAP = {'minus_zero': '-0',
 
 # Flags in auto-libm-test-out that map directly to C flags.
 FLAGS_SIMPLE = {'ignore-zero-inf-sign': 'IGNORE_ZERO_INF_SIGN',
-                'no-test-inline': 'NO_TEST_INLINE',
                 'xfail': 'XFAIL_TEST'}
 
 # Exceptions in auto-libm-test-out, and their corresponding C flags
@@ -558,7 +557,6 @@ def gen_test_line(descr_args, descr_res, args_str):
                 or 'ERRNO' in res[-1]
                 or 'IGNORE_ZERO_INF_SIGN' in res[-1]
                 or 'TEST_NAN_SIGN' in res[-1]
-                or 'NO_TEST_INLINE' in res[-1]
                 or 'XFAIL' in res[-1]):
             raise ValueError('wrong number of arguments: %s' % args_str)
         res_rm = [res, res, res, res]
diff --git a/math/libm-test-asinh.inc b/math/libm-test-asinh.inc
index 52240b2c8c..dca1fce754 100644
--- a/math/libm-test-asinh.inc
+++ b/math/libm-test-asinh.inc
@@ -20,8 +20,8 @@
 
 static const struct test_f_f_data asinh_test_data[] =
   {
-    TEST_f_f (asinh, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_f_f (asinh, minus_infty, minus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
+    TEST_f_f (asinh, plus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_f_f (asinh, minus_infty, minus_infty, ERRNO_UNCHANGED),
     TEST_f_f (asinh, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (asinh, -qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (asinh, snan_value, qnan_value, INVALID_EXCEPTION),
diff --git a/math/libm-test-atanh.inc b/math/libm-test-atanh.inc
index 2ed521045b..af17474e56 100644
--- a/math/libm-test-atanh.inc
+++ b/math/libm-test-atanh.inc
@@ -30,8 +30,8 @@ static const struct test_f_f_data atanh_test_data[] =
     /* atanh (x) == qNaN plus invalid exception if |x| > 1.  */
     TEST_f_f (atanh, 1.125L, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
     TEST_f_f (atanh, -1.125L, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
-    TEST_f_f (atanh, max_value, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM|NO_TEST_INLINE),
-    TEST_f_f (atanh, -max_value, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM|NO_TEST_INLINE),
+    TEST_f_f (atanh, max_value, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
+    TEST_f_f (atanh, -max_value, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
     TEST_f_f (atanh, plus_infty, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
     TEST_f_f (atanh, minus_infty, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
 
diff --git a/math/libm-test-cosh.inc b/math/libm-test-cosh.inc
index 9a252d75a2..cffbbc4d55 100644
--- a/math/libm-test-cosh.inc
+++ b/math/libm-test-cosh.inc
@@ -20,8 +20,8 @@
 
 static const struct test_f_f_data cosh_test_data[] =
   {
-    TEST_f_f (cosh, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_f_f (cosh, minus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
+    TEST_f_f (cosh, plus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_f_f (cosh, minus_infty, plus_infty, ERRNO_UNCHANGED),
     TEST_f_f (cosh, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (cosh, -qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (cosh, snan_value, qnan_value, INVALID_EXCEPTION),
diff --git a/math/libm-test-driver.c b/math/libm-test-driver.c
index f5b2c00b57..11b541b2e7 100644
--- a/math/libm-test-driver.c
+++ b/math/libm-test-driver.c
@@ -23,7 +23,6 @@
 /* Flags set by the including file.  */
 const int flag_test_errno = TEST_ERRNO;
 const int flag_test_exceptions = TEST_EXCEPTIONS;
-const int flag_test_inline = TEST_INLINE;
 const int flag_test_mathvec = TEST_MATHVEC;
 
 #if TEST_NARROW
@@ -41,8 +40,6 @@ const int snan_tests_arg = SNAN_TESTS (FLOAT);
 /* Informal description of the functions being tested.  */
 #if TEST_MATHVEC
 # define TEST_MSG "testing " STR_FLOAT " (vector length " STR_VEC_LEN ")\n"
-#elif TEST_INLINE
-# define TEST_MSG "testing " STR_FLOAT " (inline functions)\n"
 #elif TEST_NARROW
 # define TEST_MSG "testing " STR_FLOAT " (argument " STR_ARG_FLOAT ")\n"
 #else
@@ -70,11 +67,7 @@ const char test_msg[] = TEST_MSG;
 					 ? TEST_NAN_PAYLOAD		\
 					 : 0)
 
-#if TEST_INLINE
-const char qtype_str[] = "i" TYPE_STR;
-#else
 const char qtype_str[] = TYPE_STR;
-#endif
 
 /* Various constants derived from pi.  We must supply them precalculated for
    accuracy.  They are written as a series of postfix operations to keep
diff --git a/math/libm-test-exp.inc b/math/libm-test-exp.inc
index a5bcb75661..8ea415cfbb 100644
--- a/math/libm-test-exp.inc
+++ b/math/libm-test-exp.inc
@@ -20,8 +20,8 @@
 
 static const struct test_f_f_data exp_test_data[] =
   {
-    TEST_f_f (exp, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_f_f (exp, minus_infty, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
+    TEST_f_f (exp, plus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_f_f (exp, minus_infty, 0, ERRNO_UNCHANGED),
     TEST_f_f (exp, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (exp, -qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (exp, snan_value, qnan_value, INVALID_EXCEPTION),
diff --git a/math/libm-test-expm1.inc b/math/libm-test-expm1.inc
index 31cc662d96..d208204112 100644
--- a/math/libm-test-expm1.inc
+++ b/math/libm-test-expm1.inc
@@ -20,8 +20,8 @@
 
 static const struct test_f_f_data expm1_test_data[] =
   {
-    TEST_f_f (expm1, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_f_f (expm1, minus_infty, -1, ERRNO_UNCHANGED|NO_TEST_INLINE),
+    TEST_f_f (expm1, plus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_f_f (expm1, minus_infty, -1, ERRNO_UNCHANGED),
     TEST_f_f (expm1, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (expm1, -qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (expm1, snan_value, qnan_value, INVALID_EXCEPTION),
diff --git a/math/libm-test-hypot.inc b/math/libm-test-hypot.inc
index 34321907b3..3122377b25 100644
--- a/math/libm-test-hypot.inc
+++ b/math/libm-test-hypot.inc
@@ -65,22 +65,22 @@ static const struct test_ff_f_data hypot_test_data[] =
     TEST_ff_f (hypot, minus_infty, plus_infty, plus_infty, ERRNO_UNCHANGED),
     TEST_ff_f (hypot, minus_infty, minus_infty, plus_infty, ERRNO_UNCHANGED),
 
-    TEST_ff_f (hypot, plus_infty, qnan_value, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (hypot, plus_infty, -qnan_value, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (hypot, minus_infty, qnan_value, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (hypot, minus_infty, -qnan_value, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (hypot, qnan_value, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (hypot, -qnan_value, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (hypot, qnan_value, minus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (hypot, -qnan_value, minus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (hypot, plus_infty, snan_value, qnan_value, INVALID_EXCEPTION|NO_TEST_INLINE),
-    TEST_ff_f (hypot, plus_infty, -snan_value, qnan_value, INVALID_EXCEPTION|NO_TEST_INLINE),
-    TEST_ff_f (hypot, minus_infty, snan_value, qnan_value, INVALID_EXCEPTION|NO_TEST_INLINE),
-    TEST_ff_f (hypot, minus_infty, -snan_value, qnan_value, INVALID_EXCEPTION|NO_TEST_INLINE),
-    TEST_ff_f (hypot, snan_value, plus_infty, qnan_value, INVALID_EXCEPTION|NO_TEST_INLINE),
-    TEST_ff_f (hypot, -snan_value, plus_infty, qnan_value, INVALID_EXCEPTION|NO_TEST_INLINE),
-    TEST_ff_f (hypot, snan_value, minus_infty, qnan_value, INVALID_EXCEPTION|NO_TEST_INLINE),
-    TEST_ff_f (hypot, -snan_value, minus_infty, qnan_value, INVALID_EXCEPTION|NO_TEST_INLINE),
+    TEST_ff_f (hypot, plus_infty, qnan_value, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (hypot, plus_infty, -qnan_value, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (hypot, minus_infty, qnan_value, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (hypot, minus_infty, -qnan_value, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (hypot, qnan_value, plus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (hypot, -qnan_value, plus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (hypot, qnan_value, minus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (hypot, -qnan_value, minus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (hypot, plus_infty, snan_value, qnan_value, INVALID_EXCEPTION),
+    TEST_ff_f (hypot, plus_infty, -snan_value, qnan_value, INVALID_EXCEPTION),
+    TEST_ff_f (hypot, minus_infty, snan_value, qnan_value, INVALID_EXCEPTION),
+    TEST_ff_f (hypot, minus_infty, -snan_value, qnan_value, INVALID_EXCEPTION),
+    TEST_ff_f (hypot, snan_value, plus_infty, qnan_value, INVALID_EXCEPTION),
+    TEST_ff_f (hypot, -snan_value, plus_infty, qnan_value, INVALID_EXCEPTION),
+    TEST_ff_f (hypot, snan_value, minus_infty, qnan_value, INVALID_EXCEPTION),
+    TEST_ff_f (hypot, -snan_value, minus_infty, qnan_value, INVALID_EXCEPTION),
 
     TEST_ff_f (hypot, 0, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_ff_f (hypot, 0, -qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
diff --git a/math/libm-test-pow.inc b/math/libm-test-pow.inc
index f09c369918..d9e64b9b38 100644
--- a/math/libm-test-pow.inc
+++ b/math/libm-test-pow.inc
@@ -29,61 +29,61 @@ static const struct test_ff_f_data pow_test_data[] =
     TEST_ff_f (pow, snan_value, minus_zero, qnan_value, INVALID_EXCEPTION|NO_TEST_MATHVEC),
     TEST_ff_f (pow, -snan_value, minus_zero, qnan_value, INVALID_EXCEPTION|NO_TEST_MATHVEC),
 
-    TEST_ff_f (pow, 1.1L, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, plus_infty, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, -1.1L, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-
-    TEST_ff_f (pow, 0.9L, plus_infty, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, 1e-7L, plus_infty, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, -0.9L, plus_infty, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, -1e-7L, plus_infty, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-
-    TEST_ff_f (pow, 1.1L, minus_infty, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, plus_infty, minus_infty, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, -1.1L, minus_infty, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, minus_infty, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-
-    TEST_ff_f (pow, 0.9L, minus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, 1e-7L, minus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, -0.9L, minus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, -1e-7L, minus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-
-    TEST_ff_f (pow, plus_infty, 1e-7L, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, plus_infty, 1, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, plus_infty, 1e7L, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, plus_infty, min_subnorm_value, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-
-    TEST_ff_f (pow, plus_infty, -1e-7L, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, plus_infty, -1, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, plus_infty, -1e7L, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, plus_infty, -min_subnorm_value, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-
-    TEST_ff_f (pow, minus_infty, 1, minus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, 11, minus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, 1001, minus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-
-    TEST_ff_f (pow, minus_infty, 2, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, 12, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, 1002, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, 0.1L, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, 1.1L, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, 11.1L, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, 1001.1L, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, min_subnorm_value, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-
-    TEST_ff_f (pow, minus_infty, -1, minus_zero, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, -11, minus_zero, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, -1001, minus_zero, ERRNO_UNCHANGED|NO_TEST_INLINE),
-
-    TEST_ff_f (pow, minus_infty, -2, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, -12, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, -1002, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, -0.1L, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, -1.1L, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, -11.1L, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, -1001.1L, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_ff_f (pow, minus_infty, -min_subnorm_value, 0, ERRNO_UNCHANGED|NO_TEST_INLINE),
+    TEST_ff_f (pow, 1.1L, plus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, plus_infty, plus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, -1.1L, plus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, plus_infty, plus_infty, ERRNO_UNCHANGED),
+
+    TEST_ff_f (pow, 0.9L, plus_infty, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, 1e-7L, plus_infty, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, -0.9L, plus_infty, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, -1e-7L, plus_infty, 0, ERRNO_UNCHANGED),
+
+    TEST_ff_f (pow, 1.1L, minus_infty, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, plus_infty, minus_infty, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, -1.1L, minus_infty, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, minus_infty, 0, ERRNO_UNCHANGED),
+
+    TEST_ff_f (pow, 0.9L, minus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, 1e-7L, minus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, -0.9L, minus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, -1e-7L, minus_infty, plus_infty, ERRNO_UNCHANGED),
+
+    TEST_ff_f (pow, plus_infty, 1e-7L, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, plus_infty, 1, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, plus_infty, 1e7L, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, plus_infty, min_subnorm_value, plus_infty, ERRNO_UNCHANGED),
+
+    TEST_ff_f (pow, plus_infty, -1e-7L, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, plus_infty, -1, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, plus_infty, -1e7L, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, plus_infty, -min_subnorm_value, 0, ERRNO_UNCHANGED),
+
+    TEST_ff_f (pow, minus_infty, 1, minus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, 11, minus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, 1001, minus_infty, ERRNO_UNCHANGED),
+
+    TEST_ff_f (pow, minus_infty, 2, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, 12, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, 1002, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, 0.1L, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, 1.1L, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, 11.1L, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, 1001.1L, plus_infty, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, min_subnorm_value, plus_infty, ERRNO_UNCHANGED),
+
+    TEST_ff_f (pow, minus_infty, -1, minus_zero, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, -11, minus_zero, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, -1001, minus_zero, ERRNO_UNCHANGED),
+
+    TEST_ff_f (pow, minus_infty, -2, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, -12, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, -1002, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, -0.1L, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, -1.1L, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, -11.1L, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, -1001.1L, 0, ERRNO_UNCHANGED),
+    TEST_ff_f (pow, minus_infty, -min_subnorm_value, 0, ERRNO_UNCHANGED),
 
     TEST_ff_f (pow, qnan_value, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_ff_f (pow, qnan_value, -qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
@@ -257,16 +257,16 @@ static const struct test_ff_f_data pow_test_data[] =
     TEST_ff_f (pow, minus_zero, minus_infty, plus_infty, ERRNO_UNCHANGED),
 
     /* pow (x, +inf) == +inf for |x| > 1.  */
-    TEST_ff_f (pow, 1.5, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
+    TEST_ff_f (pow, 1.5, plus_infty, plus_infty, ERRNO_UNCHANGED),
 
     /* pow (x, +inf) == +0 for |x| < 1.  */
-    TEST_ff_f (pow, 0.5, plus_infty, 0.0, ERRNO_UNCHANGED|NO_TEST_INLINE),
+    TEST_ff_f (pow, 0.5, plus_infty, 0.0, ERRNO_UNCHANGED),
 
     /* pow (x, -inf) == +0 for |x| > 1.  */
-    TEST_ff_f (pow, 1.5, minus_infty, 0.0, ERRNO_UNCHANGED|NO_TEST_INLINE),
+    TEST_ff_f (pow, 1.5, minus_infty, 0.0, ERRNO_UNCHANGED),
 
     /* pow (x, -inf) == +inf for |x| < 1.  */
-    TEST_ff_f (pow, 0.5, minus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
+    TEST_ff_f (pow, 0.5, minus_infty, plus_infty, ERRNO_UNCHANGED),
 
     /* pow (+inf, y) == +inf for y > 0.  */
     TEST_ff_f (pow, plus_infty, 2, plus_infty, ERRNO_UNCHANGED),
diff --git a/math/libm-test-sinh.inc b/math/libm-test-sinh.inc
index e1a1093346..9e10872a86 100644
--- a/math/libm-test-sinh.inc
+++ b/math/libm-test-sinh.inc
@@ -20,8 +20,8 @@
 
 static const struct test_f_f_data sinh_test_data[] =
   {
-    TEST_f_f (sinh, plus_infty, plus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_f_f (sinh, minus_infty, minus_infty, ERRNO_UNCHANGED|NO_TEST_INLINE),
+    TEST_f_f (sinh, plus_infty, plus_infty, ERRNO_UNCHANGED),
+    TEST_f_f (sinh, minus_infty, minus_infty, ERRNO_UNCHANGED),
     TEST_f_f (sinh, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (sinh, -qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (sinh, snan_value, qnan_value, INVALID_EXCEPTION),
diff --git a/math/libm-test-support.c b/math/libm-test-support.c
index 6601358f37..0c85c60643 100644
--- a/math/libm-test-support.c
+++ b/math/libm-test-support.c
@@ -209,7 +209,7 @@ find_ulps (const char *name, const struct ulp_data *data, size_t nmemb)
   if (entry == NULL)
     return 0;
   else
-    return entry->max_ulp[(flag_test_inline ? ulp_i_idx : ulp_idx)];
+    return entry->max_ulp[ulp_idx];
 }
 
 void
@@ -981,8 +981,6 @@ enable_test (int exceptions)
 {
   if (exceptions & XFAIL_TEST)
     return 0;
-  if (flag_test_inline && (exceptions & NO_TEST_INLINE))
-    return 0;
   if ((!SNAN_TESTS (FLOAT) || !snan_tests_arg)
       && (exceptions & TEST_SNAN) != 0)
     return 0;
diff --git a/math/libm-test-support.h b/math/libm-test-support.h
index 25535c3a41..63d3e8972b 100644
--- a/math/libm-test-support.h
+++ b/math/libm-test-support.h
@@ -34,7 +34,6 @@
 
 extern const int flag_test_errno;
 extern const int flag_test_exceptions;
-extern const int flag_test_inline;
 extern const int flag_test_mathvec;
 extern const int snan_tests_arg;
 extern const char test_msg[];
@@ -60,7 +59,6 @@ extern const char doc[];
 #define IGNORE_ZERO_INF_SIGN		0x400
 #define TEST_NAN_SIGN			0x800
 #define TEST_NAN_PAYLOAD		0x1000
-#define NO_TEST_INLINE			0x2000
 #define XFAIL_TEST			0x4000
 /* Indicate errno settings required or disallowed.  */
 #define ERRNO_UNCHANGED			0x8000
diff --git a/math/libm-test-tanh.inc b/math/libm-test-tanh.inc
index 7c49e38bd4..e7e03380f1 100644
--- a/math/libm-test-tanh.inc
+++ b/math/libm-test-tanh.inc
@@ -20,8 +20,8 @@
 
 static const struct test_f_f_data tanh_test_data[] =
   {
-    TEST_f_f (tanh, plus_infty, 1, ERRNO_UNCHANGED|NO_TEST_INLINE),
-    TEST_f_f (tanh, minus_infty, -1, ERRNO_UNCHANGED|NO_TEST_INLINE),
+    TEST_f_f (tanh, plus_infty, 1, ERRNO_UNCHANGED),
+    TEST_f_f (tanh, minus_infty, -1, ERRNO_UNCHANGED),
     TEST_f_f (tanh, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (tanh, -qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (tanh, snan_value, qnan_value, INVALID_EXCEPTION),
diff --git a/math/test-double-vlen2.h b/math/test-double-vlen2.h
index d7d7bc01a4..6eb75cd782 100644
--- a/math/test-double-vlen2.h
+++ b/math/test-double-vlen2.h
@@ -17,7 +17,6 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "test-double.h"
-#include "test-math-no-inline.h"
 #include "test-math-vector.h"
 
 #define VEC_SUFF _vlen2
diff --git a/math/test-double-vlen4.h b/math/test-double-vlen4.h
index 77fc30a4a5..7a47e7fb3d 100644
--- a/math/test-double-vlen4.h
+++ b/math/test-double-vlen4.h
@@ -17,7 +17,6 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "test-double.h"
-#include "test-math-no-inline.h"
 #include "test-math-vector.h"
 
 #define VEC_SUFF _vlen4
diff --git a/math/test-double-vlen8.h b/math/test-double-vlen8.h
index e86704703e..466fa003f7 100644
--- a/math/test-double-vlen8.h
+++ b/math/test-double-vlen8.h
@@ -17,7 +17,6 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "test-double.h"
-#include "test-math-no-inline.h"
 #include "test-math-vector.h"
 
 #define VEC_SUFF _vlen8
diff --git a/math/test-float-vlen16.h b/math/test-float-vlen16.h
index 9b236e0afd..b9eeb8ad18 100644
--- a/math/test-float-vlen16.h
+++ b/math/test-float-vlen16.h
@@ -17,7 +17,6 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "test-float.h"
-#include "test-math-no-inline.h"
 #include "test-math-vector.h"
 
 #define VEC_SUFF _vlen16
diff --git a/math/test-float-vlen4.h b/math/test-float-vlen4.h
index af965e0151..ffbc6ff5cf 100644
--- a/math/test-float-vlen4.h
+++ b/math/test-float-vlen4.h
@@ -17,7 +17,6 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "test-float.h"
-#include "test-math-no-inline.h"
 #include "test-math-vector.h"
 
 #define VEC_SUFF _vlen4
diff --git a/math/test-float-vlen8.h b/math/test-float-vlen8.h
index 70b311786e..dce482ec20 100644
--- a/math/test-float-vlen8.h
+++ b/math/test-float-vlen8.h
@@ -17,7 +17,6 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "test-float.h"
-#include "test-math-no-inline.h"
 #include "test-math-vector.h"
 
 #define VEC_SUFF _vlen8
diff --git a/math/test-math-inline.h b/math/test-math-inline.h
deleted file mode 100644
index c522236e3e..0000000000
--- a/math/test-math-inline.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Common definitions for libm tests for inline functions.
-   Copyright (C) 1997-2020 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
-   <https://www.gnu.org/licenses/>.  */
-
-#define TEST_INLINE 1
-#define TEST_ERRNO 0
-#define TEST_EXCEPTIONS 0
-
-#ifdef __NO_MATH_INLINES
-# undef __NO_MATH_INLINES
-#endif
diff --git a/math/test-math-no-inline.h b/math/test-math-no-inline.h
deleted file mode 100644
index 3843118406..0000000000
--- a/math/test-math-no-inline.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Common definitions for libm tests for non-inline functions.
-   Copyright (C) 1997-2020 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
-   <https://www.gnu.org/licenses/>.  */
-
-#define TEST_INLINE 0
-
-#ifndef __NO_MATH_INLINES
-# define __NO_MATH_INLINES
-#endif
