diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index ac1a37790574..ac881377dcb5 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
 .\" $FreeBSD$
-.Dd June 11, 2014
+.Dd June 8, 2014
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -1021,16 +1021,15 @@ Set to not build and install
 Set to not build
 .Xr telnet 8
 and related programs.
-.It Va WITHOUT_TESTS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_TESTS 267424 2014-06-12 18:54:52Z jmmv
-Set to not build nor install the
+.It Va WITH_TESTS
+.\" from FreeBSD: head/tools/build/options/WITH_TESTS 267033 2014-06-03 22:34:27Z jmmv
+Set to 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.
 .It Va WITHOUT_TEXTPROC
 .\" from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam
 Set to not build
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 398496e6e5b8..c68028538089 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -143,7 +143,6 @@ __DEFAULT_YES_OPTIONS = \
     SYSINSTALL \
     TCSH \
     TELNET \
-    TESTS \
     TEXTPROC \
     UNBOUND \
     USB \
@@ -169,6 +168,7 @@ __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
deleted file mode 100644
index 4d58f9abedc7..000000000000
--- a/tools/build/options/WITHOUT_TESTS
+++ /dev/null
@@ -1,9 +0,0 @@
-.\" $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
new file mode 100644
index 000000000000..acc9f19ab227
--- /dev/null
+++ b/tools/build/options/WITH_TESTS
@@ -0,0 +1,8 @@
+.\" $FreeBSD$
+Set to install the
+.Fx
+Test Suite in
+.Pa /usr/tests/ .
+See
+.Xr tests 7
+for more details.