diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 361d7f4f862f..5a2995ec82b4 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -160,7 +160,9 @@ libkern.${LIBC_ARCH}:: ${KMSRCS}
 CFLAGS+=-DSYSCALL_COMPAT
 .endif
 
-.include <bsd.arch.inc.mk>
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.lib.mk>
 
diff --git a/lib/libc/Makefile.amd64 b/lib/libc/Makefile.amd64
deleted file mode 100644
index dd0f5b0cfb2d..000000000000
--- a/lib/libc/Makefile.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/libc/Makefile.i386 b/lib/libc/Makefile.i386
deleted file mode 100644
index dd0f5b0cfb2d..000000000000
--- a/lib/libc/Makefile.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/librt/Makefile b/lib/librt/Makefile
index a2b7c5bd3ee9..b37188d67fdb 100644
--- a/lib/librt/Makefile
+++ b/lib/librt/Makefile
@@ -20,6 +20,8 @@ PRECIOUSLIB=
 
 VERSION_MAP=	${.CURDIR}/Version.map
 
-.include <bsd.arch.inc.mk>
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.lib.mk>
diff --git a/lib/librt/Makefile.amd64 b/lib/librt/Makefile.amd64
deleted file mode 100644
index dd0f5b0cfb2d..000000000000
--- a/lib/librt/Makefile.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/librt/Makefile.i386 b/lib/librt/Makefile.i386
deleted file mode 100644
index dd0f5b0cfb2d..000000000000
--- a/lib/librt/Makefile.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 05bf941f4fd6..51fa291e1cb6 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -63,6 +63,8 @@ SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
 CFLAGS+=-DSYSCALL_COMPAT
 .endif
 
-.include <bsd.arch.inc.mk>
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.lib.mk>
diff --git a/lib/libthr/Makefile.amd64 b/lib/libthr/Makefile.amd64
deleted file mode 100644
index dd0f5b0cfb2d..000000000000
--- a/lib/libthr/Makefile.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/libthr/Makefile.i386 b/lib/libthr/Makefile.i386
deleted file mode 100644
index dd0f5b0cfb2d..000000000000
--- a/lib/libthr/Makefile.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 71af60672922..44736232d5d8 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -219,6 +219,8 @@ MLINKS+=trunc.3 truncf.3 trunc.3 truncl.3
 
 .include <bsd.own.mk>
 
-.include <bsd.arch.inc.mk>
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.lib.mk>
diff --git a/lib/msun/Makefile.amd64 b/lib/msun/Makefile.amd64
deleted file mode 100644
index dd0f5b0cfb2d..000000000000
--- a/lib/msun/Makefile.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/msun/Makefile.i386 b/lib/msun/Makefile.i386
deleted file mode 100644
index dd0f5b0cfb2d..000000000000
--- a/lib/msun/Makefile.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile
index 4261e4865b52..7199ea7925b0 100644
--- a/lib/msun/tests/Makefile
+++ b/lib/msun/tests/Makefile
@@ -6,11 +6,8 @@ TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libm
 
 TESTSDIR=	${TESTSBASE}/lib/msun
 
-.if ${MACHINE} == "sparc" || ${MACHINE} == "i386" \
-	|| ${MACHINE} == "amd64" || ${MACHINE_CPU} == "arm"	\
-	|| ${MACHINE} == "sparc64"
+# All architectures on FreeBSD have fenv.h
 CFLAGS+=	-DHAVE_FENV_H
-.endif
 
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
 CFLAGS+=	-D__HAVE_LONG_DOUBLE