diff --git a/devel/atf/Makefile b/devel/atf/Makefile
index 22c48809341c..439c7664b661 100644
--- a/devel/atf/Makefile
+++ b/devel/atf/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	atf
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/jmmv/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ \
 		LOCAL/jmmv
@@ -17,6 +18,7 @@ USE_LDCONFIG=	yes
 USES=		libtool
 
 OPTIONS_DEFINE=	DOCS TEST
+OPTIONS_DEFAULT=TEST
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/kyua-atf-compat/Makefile b/devel/kyua-atf-compat/Makefile
index 76f70c7716ae..04352d362422 100644
--- a/devel/kyua-atf-compat/Makefile
+++ b/devel/kyua-atf-compat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kyua-atf-compat
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	kyua
@@ -19,6 +19,7 @@ GNU_CONFIGURE=	yes
 USES=		pkgconfig
 
 OPTIONS_DEFINE=	DOCS TEST
+OPTIONS_DEFAULT=TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
diff --git a/devel/kyua-cli/Makefile b/devel/kyua-cli/Makefile
index e828da790ff9..8a3e790a825f 100644
--- a/devel/kyua-cli/Makefile
+++ b/devel/kyua-cli/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kyua-cli
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	kyua
@@ -27,6 +27,7 @@ SUB_FILES=	kyua.conf
 SUB_LIST=	TESTS_USER=${TESTS_USER}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES TEST
+OPTIONS_DEFAULT=TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
diff --git a/devel/kyua-testers/Makefile b/devel/kyua-testers/Makefile
index 86b1798cdd83..81f6c1b2bb00 100644
--- a/devel/kyua-testers/Makefile
+++ b/devel/kyua-testers/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kyua-testers
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	kyua
@@ -16,6 +16,7 @@ LICENSE=	BSD
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS TEST
+OPTIONS_DEFAULT=TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index 64d89a2db92d..814d4a714859 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lutok
 PORTVERSION=	0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -18,6 +18,7 @@ USE_LDCONFIG=	yes
 USES=		libtool lua pkgconfig
 
 OPTIONS_DEFINE=	DOCS EXAMPLES TEST
+OPTIONS_DEFAULT=TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
diff --git a/devel/shtk/Makefile b/devel/shtk/Makefile
index 9bba9cee1386..3f2cf5d72283 100644
--- a/devel/shtk/Makefile
+++ b/devel/shtk/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	shtk
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/jmmv/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ \
 		LOCAL/jmmv
@@ -17,6 +17,7 @@ GNU_CONFIGURE=	yes
 MAKE_ARGS=      pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 OPTIONS_DEFINE=		TEST
+OPTIONS_DEFAULT=	TEST
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
 TEST_BUILD_DEPENDS=	${PREFIX}/bin/atf-sh:${PORTSDIR}/devel/atf