diff --git a/cddl/usr.sbin/dtrace/tests/Makefile b/cddl/usr.sbin/dtrace/tests/Makefile
index ba5a7365840..46c8436ebff 100644
--- a/cddl/usr.sbin/dtrace/tests/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/Makefile
@@ -4,6 +4,10 @@
 
 TESTS_SUBDIRS+=	common
 
+.if ${MACHINE_CPUARCH} == "i386"
+TESTS_SUBDIRS+= i386
+.endif
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
diff --git a/cddl/usr.sbin/dtrace/tests/i386/Makefile b/cddl/usr.sbin/dtrace/tests/i386/Makefile
new file mode 100644
index 00000000000..bd6f7cf5ad5
--- /dev/null
+++ b/cddl/usr.sbin/dtrace/tests/i386/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/cddl/usr.sbin/dtrace/i386
+TESTS_SUBDIRS+= arrays \
+		funcs \
+		pid \
+		ustack
+
+.PATH:		${.CURDIR:H:H:H:H:H}/tests
+KYUAFILE=	YES
+
+.include <bsd.test.mk>
diff --git a/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile
new file mode 100644
index 00000000000..e97c9c64fbb
--- /dev/null
+++ b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+#
+# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
+#
+
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
+     tst.uregsarray.d  \
+
+TESTEXES= \
+
+
+CFILES= \
+
+
+
+.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile
new file mode 100644
index 00000000000..64a00fa57d8
--- /dev/null
+++ b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+#
+# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
+#
+
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
+     tst.badcopyin.d  \
+     tst.badcopyinstr.d  \
+     tst.badcopyout.d  \
+     tst.badcopyoutstr.d  \
+
+TESTEXES= \
+
+
+CFILES= \
+
+
+
+.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile
new file mode 100644
index 00000000000..61fb328cbc7
--- /dev/null
+++ b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+#
+# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
+#
+
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
+     tst.badinstr.d  \
+     tst.branch.d  \
+     tst.embedded.d  \
+     tst.ret.d  \
+     tst.retlist.ksh  \
+
+TESTEXES= \
+
+
+CFILES= \
+
+
+
+.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile
new file mode 100644
index 00000000000..bc7c6a2d34c
--- /dev/null
+++ b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+#
+# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
+#
+
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
+     annotated_helper.d  \
+     helper_helper.d  \
+     tst.annotated.d  \
+     tst.annotated.d.out  \
+     tst.circstack.d  \
+     tst.helper.d  \
+     tst.helper.d.out  \
+
+TESTEXES= \
+
+
+CFILES= \
+     tst.annotated.c  \
+     tst.helper.c  \
+
+
+.include "../../dtrace.test.mk"
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 377c0bcb5fa..4f3c8dc8395 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -238,6 +238,16 @@
                     version
                     ..
                 ..
+                i386
+                    arrays
+                    ..
+                    funcs
+                    ..
+                    pid
+                    ..
+                    ustack
+                    ..
+                ..
             ..
             zfsd
             ..