diff --git a/pts/csgo-1.7.2/install_windows.sh b/pts/csgo-1.7.2/install_windows.sh
index 659ea669..3e619205 100644
--- a/pts/csgo-1.7.2/install_windows.sh
+++ b/pts/csgo-1.7.2/install_windows.sh
@@ -1,16 +1,28 @@
 #!/bin/sh
 
-steam steam://install/730
+if /cygdrive/c/windows/system32/reg.exe query "HKEY_CURRENT_USER\Software\Valve\Steam" /v SteamPath
+then
+    STEAMPATH=`/cygdrive/c/windows/system32/reg.exe query "HKEY_CURRENT_USER\Software\Valve\Steam" /v SteamPath | awk '$1 ~ "SteamPath" && $2 ~ "REG_SZ" { ORS=""; for (i = 3; i < NF; i++) print($i " "); print(substr($NF, 1, length($NF)-1)) }'`
+else
+    echo "ERROR: Steam is not found on the system! This test profile needs to find Steam configuration data in the Windows Registry."
+	echo 2 > ~/install-exit-status
+    exit
+fi
+
+"/cygdrive/${STEAMPATH:0:1}/${STEAMPATH:3}/steam.exe" "steam://install/730"
 
 unzip -o csgo-demo-10.zip
-mv pts10.dem "C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive\csgo"
+mv pts10.dem "${STEAMPATH}/steamapps/common/Counter-Strike Global Offensive/csgo"
 
 echo "#!/bin/sh
-cd \"C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive\"
+cd \"${STEAMPATH}/steamapps/common/Counter-Strike Global Offensive\"
 rm -rf csgo/SourceBench*
 rm -f UNKNOWN
-./csgo.exe -game csgo \$@ +con_logfile log.log
+../../../steam.exe -applaunch 730 \$@ +con_logfile log.log
+sleep 6 # Short wait for Steam to start the CS:GO process.
+powershell.exe -NonInteractive -Command \"Wait-Process csgo\"
 cat csgo/log.log* > \$LOG_FILE
 cat csgo/SourceBench* >> \$LOG_FILE
 cat csgo/UNKNOWN >> \$LOG_FILE" > csgo
 chmod +x csgo
+echo 0 > ~/install-exit-status