diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 68c015d82902..ffa8bd72d472 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -149,6 +149,8 @@
             ..
             libproc
             ..
+            librt
+            ..
             libthr
                 dlopen
                 ..
diff --git a/lib/librt/Makefile b/lib/librt/Makefile
index f624cf7b1d50..bd6ec0717d91 100644
--- a/lib/librt/Makefile
+++ b/lib/librt/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 LIB=rt
 SHLIB_MAJOR= 1
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}
@@ -18,4 +20,6 @@ PRECIOUSLIB=
 
 VERSION_MAP=	${.CURDIR}/Version.map
 
+.include <bsd.arch.inc.mk>
+
 .include <bsd.lib.mk>
diff --git a/lib/librt/Makefile.amd64 b/lib/librt/Makefile.amd64
new file mode 100644
index 000000000000..dd0f5b0cfb2d
--- /dev/null
+++ b/lib/librt/Makefile.amd64
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
diff --git a/lib/librt/Makefile.i386 b/lib/librt/Makefile.i386
new file mode 100644
index 000000000000..dd0f5b0cfb2d
--- /dev/null
+++ b/lib/librt/Makefile.i386
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
diff --git a/lib/librt/tests/Makefile b/lib/librt/tests/Makefile
new file mode 100644
index 000000000000..224f52ea85aa
--- /dev/null
+++ b/lib/librt/tests/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+OBJTOP=		${.OBJDIR:H:H:H}
+SRCTOP=		${.CURDIR:H:H:H}
+TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/librt
+
+TESTSDIR=	${TESTSBASE}/lib/librt
+
+DPADD+=		${LIBRT}
+LDADD+=		-lrt
+
+NETBSD_ATF_TESTS_C=	sched_test
+NETBSD_ATF_TESTS_C+=	sem_test
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>