diff --git a/devel/debug/src/sbin/opnsense-atf b/devel/debug/src/sbin/opnsense-atf
index 80777d810..3e22d9ab2 100755
--- a/devel/debug/src/sbin/opnsense-atf
+++ b/devel/debug/src/sbin/opnsense-atf
@@ -46,7 +46,6 @@ while getopts adlV OPT; do
 		;;
 	d)
 		DO_DEBUG="-d"
-		PATTERNS="-e ."
 		;;
 	l)
 		DO_LIST="-l"
@@ -95,16 +94,22 @@ run()
 		if [ -n "${TESTCASE}" -a "${TESTCASE}" != "${CASE}" ]; then
 			continue
 		fi
+
+		echo -n ">>> $(basename ${TESTDIR})(${TESTFILE}:${CASE}): "
+
 		if [ -n "${CLEANUP}" ]; then
 			${ATFCMD} ${TEST} ${CASE}:cleanup > /dev/null 2>&1
 		fi
-		RESULT=$( (${ATFCMD} ${TEST} ${CASE} 2>&1) | grep ${PATTERNS})
+
+		RESULT=$(${ATFCMD} ${TEST} ${CASE} 2>&1)
+
 		if [ -n "${CLEANUP}" ]; then
 			${ATFCMD} ${TEST} ${CASE}:cleanup > /dev/null 2>&1
 		fi
-		if [ -z "${DO_DEBUG}" ]; then
-			echo ">>> $(basename ${TESTDIR})(${TESTFILE}:${CASE}): ${RESULT}"
-		else
+
+		(echo "${RESULT}" | grep ${PATTERN})
+
+		if [ -n "${DO_DEBUG}" ]; then
 			echo "${RESULT}"
 		fi
 	done