diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile
index 61fd83ee1533..dfac5a252f28 100644
--- a/lib/msun/tests/Makefile
+++ b/lib/msun/tests/Makefile
@@ -36,11 +36,34 @@ NETBSD_ATF_TESTS_C+=	sqrt_test
 NETBSD_ATF_TESTS_C+=	tan_test
 NETBSD_ATF_TESTS_C+=	tanh_test
 
+TAP_TESTS_C+=	cexp_test
+TAP_TESTS_C+=	conj_test
+TAP_TESTS_C+=	csqrt_test
+TAP_TESTS_C+=	fenv_test
+TAP_TESTS_C+=	fmaxmin_test
+TAP_TESTS_C+=	ilogb_test
+TAP_TESTS_C+=	invctrig_test
+TAP_TESTS_C+=	logarithm_test
+TAP_TESTS_C+=	lrint_test
+TAP_TESTS_C+=	nan_test
+TAP_TESTS_C+=	nearbyint_test
+TAP_TESTS_C+=	next_test
+TAP_TESTS_C+=	rem_test
+TAP_TESTS_C+=	trig_test
+
+.for t in ${TAP_TESTS_C}
+CFLAGS.$t+=	-O0
+CFLAGS.$t+=	-I${SRCTOP}/tools/regression/lib/msun
+.endfor
+
 CSTD=		c99
 
-LIBADD+=	m
 #COPTS+=	-Wfloat-equal
 
+IGNORE_PRAGMA=
+
+LIBADD+=	m
+
 # Copied from lib/msun/Makefile
 .if ${MACHINE_CPUARCH} == "i386"
 ARCH_SUBDIR= i387
diff --git a/tools/regression/lib/msun/test-cexp.c b/lib/msun/tests/cexp_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-cexp.c
rename to lib/msun/tests/cexp_test.c
diff --git a/tools/regression/lib/msun/test-conj.c b/lib/msun/tests/conj_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-conj.c
rename to lib/msun/tests/conj_test.c
diff --git a/tools/regression/lib/msun/test-csqrt.c b/lib/msun/tests/csqrt_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-csqrt.c
rename to lib/msun/tests/csqrt_test.c
diff --git a/tools/regression/lib/msun/test-fenv.c b/lib/msun/tests/fenv_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-fenv.c
rename to lib/msun/tests/fenv_test.c
diff --git a/tools/regression/lib/msun/test-fmaxmin.c b/lib/msun/tests/fmaxmin_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-fmaxmin.c
rename to lib/msun/tests/fmaxmin_test.c
diff --git a/tools/regression/lib/msun/test-ilogb.c b/lib/msun/tests/ilogb_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-ilogb.c
rename to lib/msun/tests/ilogb_test.c
diff --git a/tools/regression/lib/msun/test-invctrig.c b/lib/msun/tests/invctrig_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-invctrig.c
rename to lib/msun/tests/invctrig_test.c
diff --git a/tools/regression/lib/msun/test-logarithm.c b/lib/msun/tests/logarithm_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-logarithm.c
rename to lib/msun/tests/logarithm_test.c
diff --git a/tools/regression/lib/msun/test-lrint.c b/lib/msun/tests/lrint_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-lrint.c
rename to lib/msun/tests/lrint_test.c
diff --git a/tools/regression/lib/msun/test-nan.c b/lib/msun/tests/nan_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-nan.c
rename to lib/msun/tests/nan_test.c
diff --git a/tools/regression/lib/msun/test-nearbyint.c b/lib/msun/tests/nearbyint_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-nearbyint.c
rename to lib/msun/tests/nearbyint_test.c
diff --git a/tools/regression/lib/msun/test-next.c b/lib/msun/tests/next_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-next.c
rename to lib/msun/tests/next_test.c
diff --git a/tools/regression/lib/msun/test-rem.c b/lib/msun/tests/rem_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-rem.c
rename to lib/msun/tests/rem_test.c
diff --git a/tools/regression/lib/msun/test-trig.c b/lib/msun/tests/trig_test.c
similarity index 100%
rename from tools/regression/lib/msun/test-trig.c
rename to lib/msun/tests/trig_test.c
diff --git a/tools/regression/lib/msun/Makefile b/tools/regression/lib/msun/Makefile
index dbf582fadb8d..8b301cbd10d1 100644
--- a/tools/regression/lib/msun/Makefile
+++ b/tools/regression/lib/msun/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
-TESTS=	test-cexp test-conj test-csqrt test-ctrig \
-	test-exponential test-fenv test-fma \
-	test-fmaxmin test-ilogb test-invtrig test-invctrig \
-	test-logarithm test-lrint \
-	test-lround test-nan test-nearbyint test-next test-rem test-trig
+TESTS=	test-ctrig \
+	test-exponential test-fma \
+	test-lround test-nearbyint test-next test-rem test-trig
 CFLAGS+= -O0 -lm -Wno-unknown-pragmas
 
 .PHONY: tests
diff --git a/tools/regression/lib/msun/test-cexp.t b/tools/regression/lib/msun/test-cexp.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-cexp.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-conj.t b/tools/regression/lib/msun/test-conj.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-conj.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-csqrt.t b/tools/regression/lib/msun/test-csqrt.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-csqrt.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-fenv.t b/tools/regression/lib/msun/test-fenv.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-fenv.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-fmaxmin.t b/tools/regression/lib/msun/test-fmaxmin.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-fmaxmin.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-ilogb.t b/tools/regression/lib/msun/test-ilogb.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-ilogb.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-logarithm.t b/tools/regression/lib/msun/test-logarithm.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-logarithm.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-lrint.t b/tools/regression/lib/msun/test-lrint.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-lrint.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-nan.t b/tools/regression/lib/msun/test-nan.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-nan.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-nearbyint.t b/tools/regression/lib/msun/test-nearbyint.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-nearbyint.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-next.t b/tools/regression/lib/msun/test-next.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-next.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-rem.t b/tools/regression/lib/msun/test-rem.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-rem.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/msun/test-trig.t b/tools/regression/lib/msun/test-trig.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-trig.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable