diff --git a/setup/so-setup b/setup/so-setup
index a9c7776c3..99a7c672e 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -183,9 +183,26 @@ if [ -n "$test_profile" ]; then
 		install_type=SEARCHNODE
 		HOSTNAME=search
 		MSRVIP_OFFSET=-1
-	else
+	elif [[ "$test_profile" =~ "-managersearch" ]]; then
+		install_type=MANAGERSEARCH
+	elif [[ "$test_profile" =~ "-heavynode" ]]; then
+		install_type=HEAVYNODE
+		HOSTNAME=sensor
+		MSRVIP_OFFSET=-1
+	elif [[ "$test_profile" =~ "-desktop" ]]; then
+		install_type=DESKTOP
+		MSRVIP_OFFSET=-3
+		is_desktop_grid=true
+	fi
+	
+	if [[ -z "$HOSTNAME" ]]; then
 		HOSTNAME=manager
 	fi
+
+	if [[ "$install_type" =~ "DESKTOP" ]]; then
+		is_desktop=true
+		hostname=desktop
+	fi
 	
 	info "Activating test profile; profile=$test_profile; install_type=$install_type"