diff --git a/setup/so-setup b/setup/so-setup
index 020882347..3804b1e96 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -108,9 +108,6 @@ if [[ -f automation/$automation && $(basename $automation) == $automation ]]; th
 	echo "Preselecting variable values based on automated setup: $automation" >> $setup_log 2>&1
 	source automation/$automation
 	automated=yes
-	get_scp_cmd $automated
-	get_ssh_cmd $automated
-	get_ssh_copy_id_cmd $automated
 
 	attempt=1
 	attempts=60
@@ -148,6 +145,11 @@ case "$setup_type" in
 		;;
 esac
 
+#set ssh command thats will be used based on if this is an automated test install or not
+get_scp_cmd $automated
+get_ssh_cmd $automated
+get_ssh_copy_id_cmd $automated
+
 # Allow execution of SO tools during setup
 local_sbin="$(pwd)/../salt/common/tools/sbin"
 export PATH=$PATH:$local_sbin