diff --git a/appveyor-windows-binary.yml b/appveyor-windows-binary.yml
index 3e8e25772d..4cd5221819 100644
--- a/appveyor-windows-binary.yml
+++ b/appveyor-windows-binary.yml
@@ -41,6 +41,8 @@ environment:
   AWS_ECR: "AWS_ECR_TESTING"
   APPVEYOR_CONSOLE_DISABLE_PTY: true
 
+  SAM_WINDOWS_BINARY_PATH: "C:\\Program Files\\Amazon\\AWSSAMCLI_NIGHTLY\\bin\\sam-nightly.cmd"
+
 init:
   # Uncomment this for RDP
   # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
@@ -137,10 +139,9 @@ install:
   - ps: "
     Invoke-WebRequest -Uri https://github.com/aws/aws-sam-cli/releases/download/sam-cli-nightly/AWS_SAM_CLI_64_PY3.msi -OutFile aws-sam-cli-installer.msi;
     Start-Process 'C:\\Windows\\System32\\msiexec.exe' -ArgumentList '/i aws-sam-cli-installer.msi /qn /norestart' -wait -PassThru;
-    Rename-Item -Path 'C:\\Program Files\\Amazon\\AWSSAMCLI_NIGHTLY\\bin\\sam-nightly.cmd' -NewName 'C:\\Program Files\\Amazon\\AWSSAMCLI_NIGHTLY\\bin\\sam.cmd'
   "
   - 'set PATH=C:\Program Files\Amazon\AWSSAMCLI_NIGHTLY\bin\;%PATH%'
-  - 'sam --version'
+  - 'sam-nightly --version'
 
   # Echo final Path
   - "echo %PATH%"
diff --git a/tests/testing_utils.py b/tests/testing_utils.py
index 06e666ed4a..aa281091cf 100644
--- a/tests/testing_utils.py
+++ b/tests/testing_utils.py
@@ -46,8 +46,9 @@
 
 
 def get_sam_command():
-    if os.getenv("SAM_WINDOWS_BINARY_PATH"):
-        return os.getenv("SAM_WINDOWS_BINARY_PATH")
+    windows_bin_path = os.getenv("SAM_WINDOWS_BINARY_PATH")
+    if windows_bin_path:
+        return windows_bin_path
     return "samdev" if os.getenv("SAM_CLI_DEV") else "sam"