diff --git a/pkg/machine/e2e/basic_test.go b/pkg/machine/e2e/basic_test.go
index f3113f64d3..408096ed91 100644
--- a/pkg/machine/e2e/basic_test.go
+++ b/pkg/machine/e2e/basic_test.go
@@ -113,7 +113,7 @@ var _ = Describe("run basic podman commands", func() {
 		Expect(err).ToNot(HaveOccurred())
 		Expect(volumeCreate).To(Exit(0))
 
-		run, err := mb.setCmd(bm.withPodmanCommand([]string{"run", "-v", "a:/test:Z", "quay.io/libpod/alpine_nginx", "true"})).run()
+		run, err := mb.setCmd(bm.withPodmanCommand([]string{"run", "-v", "a:/test:Z", TESTIMAGE, "true"})).run()
 		Expect(err).ToNot(HaveOccurred())
 		Expect(run).To(Exit(0))
 	})
diff --git a/pkg/machine/e2e/cp_test.go b/pkg/machine/e2e/cp_test.go
index 2aa8c2b193..808e96bdcf 100644
--- a/pkg/machine/e2e/cp_test.go
+++ b/pkg/machine/e2e/cp_test.go
@@ -357,7 +357,8 @@ var _ = Describe("run cp commands", func() {
 		switch runtime.GOOS {
 		case "windows":
 			hostDirPath = filepath.ToSlash(hostDirPath)
-			fallthrough
+			Expect(session.errorToString()).To(Or(ContainSubstring(fmt.Sprintf("scp: open local \"%s\": No such file or directory", hostDirPath)),
+				ContainSubstring(fmt.Sprintf("scp: open local \"%s\": Unknown error", hostDirPath))))
 		case "darwin":
 			Expect(session.errorToString()).To(ContainSubstring(fmt.Sprintf("scp: open local \"%s\": No such file or directory", hostDirPath)))
 		case "linux":
diff --git a/winmake.ps1 b/winmake.ps1
index 4ab6ae2afd..a02fe344e3 100644
--- a/winmake.ps1
+++ b/winmake.ps1
@@ -78,10 +78,15 @@ function Local-Machine {
     );
     Build-Ginkgo
     if ($files) {
-         $files = " --focus-file $files "
+         $files = "--focus-file ""$files"""
+    } elseif ($FOCUS_FILE) {
+        $files = "--focus-file ""$FOCUS_FILE"" --silence-skips"
+    }
+    if ($FOCUS) {
+        $focus = "--focus ""$FOCUS"" --silence-skips"
     }
 
-    Run-Command "./bin/ginkgo.exe -vv  --tags `"$remotetags`" --timeout=90m --trace --no-color $files pkg/machine/e2e/."
+    Run-Command "./bin/ginkgo.exe -vv  --tags `"$remotetags`" --timeout=90m --trace --no-color $focus $files pkg/machine/e2e/."
 }
 
 # Expect starting directory to be /podman