diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/amd64/kinst/tst.basic.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/kinst/tst.basic.ksh
rename from cddl/contrib/opensolaris/cmd/dtrace/test/tst/amd64/kinst/tst.basic.ksh
rename to cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/kinst/tst.basic.ksh
diff --git a/cddl/usr.sbin/dtrace/tests/amd64/Makefile b/cddl/usr.sbin/dtrace/tests/amd64/Makefile
--- a/cddl/usr.sbin/dtrace/tests/amd64/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/amd64/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 TESTSDIR=	${TESTSBASE}/cddl/usr.sbin/dtrace/amd64
-TESTS_SUBDIRS+= arrays \
-		kinst
+TESTS_SUBDIRS+= arrays
 
 .PATH:		${.CURDIR:H:H:H:H:H}/tests
 KYUAFILE=	YES
diff --git a/cddl/usr.sbin/dtrace/tests/common/Makefile b/cddl/usr.sbin/dtrace/tests/common/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/Makefile
@@ -32,6 +32,7 @@
 		ip \
 		java_api \
 		json \
+		kinst \
 		lexer \
 		llquantize \
 		mdb \
diff --git a/cddl/usr.sbin/dtrace/tests/amd64/kinst/Makefile b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
rename from cddl/usr.sbin/dtrace/tests/amd64/kinst/Makefile
rename to cddl/usr.sbin/dtrace/tests/common/kinst/Makefile