diff --git a/setup/so-setup b/setup/so-setup
index f430efb4b..5555cd8f9 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -181,10 +181,10 @@ if [ -n "$test_profile" ]; then
 	# The below settings are hardcoded purely for automated testing purposes.
 	TESTING=true
 	
-	if [[ "$test_profile" =~ "-sensor-" ]]; then
+	if [[ "$test_profile" =~ "-sensor" ]]; then
 		HOSTNAME=sensor
 		MSRVIP_OFFSET=-2
-	elif [[ "$test_profile" =~ "-search-" ]]; then
+	elif [[ "$test_profile" =~ "-search" ]]; then
 		HOSTNAME=search
 		MSRVIP_OFFSET=-1
 	else
@@ -196,7 +196,6 @@ if [ -n "$test_profile" ]; then
 		address_type=DHCP
 	elif [[ "$test_profile" =~ "-cloud" ]]; then
 		MSRVIP=10.99.1.20
-	elif [[ "$test_profile" =~ "-iso" ]]; then
 	elif [[ "$test_profile" =~ "-airgap" ]]; then
 		is_airgap=true
 	fi