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
similarity index 100%
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
index db421ea0880f..39ccd333bedf 100644
--- a/cddl/usr.sbin/dtrace/tests/amd64/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/amd64/Makefile
@@ -1,10 +1,9 @@
 # $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
 
 .include <bsd.test.mk>
diff --git a/cddl/usr.sbin/dtrace/tests/common/Makefile b/cddl/usr.sbin/dtrace/tests/common/Makefile
index c395269e7aa9..1b552bf56889 100644
--- a/cddl/usr.sbin/dtrace/tests/common/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/Makefile
@@ -1,91 +1,92 @@
 # $FreeBSD$
 
 # We exclude several subdirectories: nfs and sysevent do not compile on
 # FreeBSD, and docsExamples doesn't seem amenable to automated testing.
 
 TESTSDIR=	${TESTSBASE}/cddl/usr.sbin/dtrace/common
 TESTS_SUBDIRS+= aggs \
 		arithmetic \
 		arrays \
 		assocs \
 		begin \
 		bitfields \
 		buffering \
 		builtinvar \
 		cg \
 		clauses \
 		cpc \
 		decls \
 		drops \
 		dtraceUtil \
 		end \
 		env \
 		enum \
 		error \
 		exit \
 		fbtprovider \
 		funcs \
 		grammar \
 		include \
 		inline \
 		io \
 		ip \
 		java_api \
 		json \
+		kinst \
 		lexer \
 		llquantize \
 		mdb \
 		mib \
 		misc \
 		multiaggs \
 		offsetof \
 		operators \
 		pid \
 		plockstat \
 		pointers \
 		pragma \
 		predicates \
 		preprocessor \
 		print \
 		printa \
 		printf \
 		privs \
 		probes \
 		proc \
 		profile-n \
 		providers \
 		raise \
 		rates \
 		safety \
 		scalars \
 		sched \
 		scripting \
 		sdt \
 		sizeof \
 		speculation \
 		stability \
 		stack \
 		stackdepth \
 		stop \
 		strlen \
 		strtoll \
 		struct \
 		sugar \
 		syscall \
 		tick-n \
 		trace \
 		tracemem \
 		translators \
 		typedef \
 		types \
 		uctf \
 		union \
 		usdt \
 		ustack \
 		vars \
 		version \
 
 .PATH:		${.CURDIR:H:H:H:H:H}/tests
 KYUAFILE=	YES
 
 .include <bsd.test.mk>
diff --git a/cddl/usr.sbin/dtrace/tests/amd64/kinst/Makefile b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
similarity index 100%
rename from cddl/usr.sbin/dtrace/tests/amd64/kinst/Makefile
rename to cddl/usr.sbin/dtrace/tests/common/kinst/Makefile