diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index c68028538089..398496e6e5b8 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -143,6 +143,7 @@ __DEFAULT_YES_OPTIONS = \
     SYSINSTALL \
     TCSH \
     TELNET \
+    TESTS \
     TEXTPROC \
     UNBOUND \
     USB \
@@ -168,7 +169,6 @@ __DEFAULT_NO_OPTIONS = \
     SHARED_TOOLCHAIN \
     SORT_THREADS \
     SVN \
-    TESTS \
     USB_GADGET_EXAMPLES
 
 #
diff --git a/tools/build/options/WITHOUT_TESTS b/tools/build/options/WITHOUT_TESTS
new file mode 100644
index 000000000000..4d58f9abedc7
--- /dev/null
+++ b/tools/build/options/WITHOUT_TESTS
@@ -0,0 +1,9 @@
+.\" $FreeBSD$
+Set to not build nor install the
+.Fx
+Test Suite in
+.Pa /usr/tests/ .
+See
+.Xr tests 7
+for more details.
+This also disables the build of all test-related dependencies, including ATF.
diff --git a/tools/build/options/WITH_TESTS b/tools/build/options/WITH_TESTS
deleted file mode 100644
index acc9f19ab227..000000000000
--- a/tools/build/options/WITH_TESTS
+++ /dev/null
@@ -1,8 +0,0 @@
-.\" $FreeBSD$
-Set to install the
-.Fx
-Test Suite in
-.Pa /usr/tests/ .
-See
-.Xr tests 7
-for more details.