Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -200,7 +200,6 @@
     CLANG_EXTRAS \
     CLANG_FORMAT \
     DETECT_TZ_CHANGES \
-    DTRACE_TESTS \
     EXPERIMENTAL \
     HESIOD \
     LOADER_FIREWIRE \
@@ -348,6 +347,13 @@
 __DEFAULT_NO_OPTIONS+=OPENMP
 .endif
 
+# DTrace tests is considered experimental on architectures other than amd64
+.if ${__T} == "amd64"
+__DEFAULT_YES_OPTIONS+=DTRACE_TESTS
+.else
+__DEFAULT_NO_OPTIONS+=DTRACE_TESTS
+.endif
+
 .include <bsd.mkopt.mk>
 
 #
Index: tools/build/options/WITHOUT_DTRACE_TESTS
===================================================================
--- /dev/null
+++ tools/build/options/WITHOUT_DTRACE_TESTS
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Do not build or install the DTrace test suite in
+.Pa /usr/tests/cddl/usr.sbin/dtrace .
+This test suite is considered experimental on architectures where it is not
+enabled by default and running it may cause system instability.
Index: tools/build/options/WITH_DTRACE_TESTS
===================================================================
--- tools/build/options/WITH_DTRACE_TESTS
+++ tools/build/options/WITH_DTRACE_TESTS
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
 Build and install the DTrace test suite in
 .Pa /usr/tests/cddl/usr.sbin/dtrace .
-This test suite is considered experimental on architectures other than
-amd64/amd64 and running it may cause system instability.
+This test suite is considered experimental on architectures where it is not
+enabled by default and running it may cause system instability.