diff --git a/setup/so-whiptail b/setup/so-whiptail
index 371897eb8..cbfa5a886 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -84,6 +84,8 @@ whiptail_bond_nics_mtu() {
 
 whiptail_cancel() {
 
+	[ -n "$TESTING" ] && exit 1
+
 	whiptail --title "$whiptail_title" --msgbox "Cancelling Setup." 8 75
 	if [ -d "/root/installtmp" ]; then
 		{
@@ -1490,7 +1492,7 @@ whiptail_patch_schedule_select_hours() {
 }
 
 whiptail_preflight_err() {
-	[ -n "$TESTING" ] && return
+	[ -n "$TESTING" ] && return 1
 
 	read -r -d '' message <<- EOM
 	The so-preflight script failed checking one or more URLs required by setup. Check $setup_log for more details.