diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc-pkg.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc-pkg.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc-pkg.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc-pkg.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc-pkg.shim
new file mode 100644
index 00000000000..0ec39dd3f09
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc-pkg.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "ghc-pkg"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc.shim
new file mode 100644
index 00000000000..97596f1c171
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/ghc.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "ghc"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/setup.test.hs
index 86a7cf804ea..805f56abc9c 100644
--- a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/setup.test.hs
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/setup.test.hs
@@ -1,9 +1,19 @@
 import Test.Cabal.Prelude
+import System.Directory
 
-main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
+main = setupAndCabalTest $ do
+      when isWindows $ do
+        sh <- fmap takeDirectory <$> liftIO (findExecutable "sh")
+        case sh of
+            Nothing -> skip "no sh"
+            Just sh' -> do
+                let sh'' = concatMap (\c -> case c of
+                            '\\' -> "\\\\\\\\"
+                            x -> [x]) sh'
+                void $ shell "sed" [ "-i", "-e", "s/FINDSH/" <> sh'' <> "/g", "ghc.shim", "ghc-pkg.shim"]
       env <- getTestEnv
       let cwd = testCurrentDir env
       ghc_path <- programPathM ghcProgram
       r <- withEnv [("WITH_GHC", Just ghc_path)]
-          . fails $ setup' "configure" ["-w", cwd </> "ghc"]
+          . fails $ setup' "configure" ["-w", cwd </> if isWindows then "ghc.exe" else "ghc" ]
       assertOutputContains "is version 9999999" r
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-7.10.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-7.10.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-7.10.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-7.10.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-7.10.shim
new file mode 100644
index 00000000000..16ae1ddead3
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-7.10.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "ghc-7.10"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-pkg-ghc-7.10.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-pkg-ghc-7.10.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-pkg-ghc-7.10.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-pkg-ghc-7.10.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-pkg-ghc-7.10.shim
new file mode 100644
index 00000000000..9e85ac7f0fb
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/ghc-pkg-ghc-7.10.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "ghc-pkg-ghc-7.10"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/setup.test.hs
index 0b0a37413be..e60d3685863 100644
--- a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/setup.test.hs
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/setup.test.hs
@@ -1,9 +1,19 @@
 import Test.Cabal.Prelude
+import System.Directory
 
-main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
+main = setupAndCabalTest $ do
+      when isWindows $ do
+        sh <- fmap takeDirectory <$> liftIO (findExecutable "sh")
+        case sh of
+            Nothing -> skip "no sh"
+            Just sh' -> do
+                let sh'' = concatMap (\c -> case c of
+                            '\\' -> "\\\\\\\\"
+                            x -> [x]) sh'
+                void $ shell "sed" [ "-i", "-e", "s/FINDSH/" <> sh'' <> "/g", "ghc-7.10.shim", "ghc-pkg-ghc-7.10.shim"]
       env <- getTestEnv
       let cwd = testCurrentDir env
       ghc_path <- programPathM ghcProgram
       r <- withEnv [("WITH_GHC", Just ghc_path)]
-         . fails $ setup' "configure" ["-w", cwd </> "ghc-7.10"]
+         . fails $ setup' "configure" ["-w", cwd </> if isWindows then "ghc-7.10.exe" else "ghc-7.10"]
       assertOutputContains "is version 9999999" r
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-7.10.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-7.10.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-7.10.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-7.10.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-7.10.shim
new file mode 100644
index 00000000000..16ae1ddead3
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-7.10.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "ghc-7.10"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-pkg-7.10.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-pkg-7.10.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-pkg-7.10.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-pkg-7.10.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-pkg-7.10.shim
new file mode 100644
index 00000000000..8558f8a0513
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/ghc-pkg-7.10.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "ghc-pkg-7.10"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/setup.test.hs
index 0b0a37413be..b5f6b4c88d6 100644
--- a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/setup.test.hs
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/setup.test.hs
@@ -1,9 +1,19 @@
 import Test.Cabal.Prelude
+import System.Directory
 
-main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
+main = setupAndCabalTest $ do
+      when isWindows $ do
+        sh <- fmap takeDirectory <$> liftIO (findExecutable "sh")
+        case sh of
+            Nothing -> skip "no sh"
+            Just sh' -> do
+                let sh'' = concatMap (\c -> case c of
+                            '\\' -> "\\\\\\\\"
+                            x -> [x]) sh'
+                void $ shell "sed" [ "-i", "-e", "s/FINDSH/" <> sh'' <> "/g", "ghc-7.10.shim", "ghc-pkg-7.10.shim"]
       env <- getTestEnv
       let cwd = testCurrentDir env
       ghc_path <- programPathM ghcProgram
       r <- withEnv [("WITH_GHC", Just ghc_path)]
-         . fails $ setup' "configure" ["-w", cwd </> "ghc-7.10"]
+         . fails $ setup' "configure" ["-w", cwd </> if isWindows then "ghc-7.10.exe" else "ghc-7.10"]
       assertOutputContains "is version 9999999" r
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc-pkg.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc-pkg.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc-pkg.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc-pkg.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc-pkg.shim
new file mode 100644
index 00000000000..1c68332a0a6
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc-pkg.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "bin\ghc-pkg"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc.shim
new file mode 100644
index 00000000000..97596f1c171
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/bin/ghc.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "ghc"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/setup.test.hs
index 0b80a76a952..b188acc36d6 100644
--- a/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/setup.test.hs
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/setup.test.hs
@@ -1,10 +1,22 @@
 import Test.Cabal.Prelude
+import System.Directory
 
-main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
-    withSymlink "bin/ghc" "ghc" $ do
+main = setupAndCabalTest $ do
+    when isWindows $ do
+        sh <- fmap takeDirectory <$> liftIO (findExecutable "sh")
+        case sh of
+            Nothing -> skip "no sh"
+            Just sh' -> do
+                let sh'' = concatMap (\c -> case c of
+                            '\\' -> "\\\\\\\\"
+                            x -> [x]) sh'
+                void $ shell "sed" [ "-i", "-e", "s/FINDSH/" <> sh'' <> "/g", "bin/ghc.shim", "bin/ghc-pkg.shim"]
+    (if isWindows
+        then withSymlink "bin/ghc.exe" "ghc.exe" . withSymlink "bin/ghc.shim" "ghc.shim" . withSymlink "bin/ghc" "ghc"
+        else withSymlink "bin/ghc" "ghc") $ do
         env <- getTestEnv
         let cwd = testCurrentDir env
         ghc_path <- programPathM ghcProgram
         r <- withEnv [("WITH_GHC", Just ghc_path)]
-           . fails $ setup' "configure" ["-w", cwd </> "ghc"]
+           . fails $ setup' "configure" ["-w", cwd </> if isWindows then "ghc.exe" else "ghc"]
         assertOutputContains "is version 9999999" r
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-7.10.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-7.10.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-7.10.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-7.10.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-7.10.shim
new file mode 100644
index 00000000000..97596f1c171
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-7.10.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "ghc"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-pkg-7.10.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-pkg-7.10.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-pkg-7.10.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-pkg-7.10.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-pkg-7.10.shim
new file mode 100644
index 00000000000..5c1d58caf88
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/bin/ghc-pkg-7.10.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "bin\ghc-pkg-7.10"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/setup.test.hs
index 150f2bc8739..bf9b16fa195 100644
--- a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/setup.test.hs
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/setup.test.hs
@@ -1,10 +1,22 @@
 import Test.Cabal.Prelude
+import System.Directory
 
-main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
-    withSymlink "bin/ghc-7.10" "ghc" $ do
+main = setupAndCabalTest $ do
+    when isWindows $ do
+        sh <- fmap takeDirectory <$> liftIO (findExecutable "sh")
+        case sh of
+            Nothing -> skip "no sh"
+            Just sh' -> do
+                let sh'' = concatMap (\c -> case c of
+                            '\\' -> "\\\\\\\\"
+                            x -> [x]) sh'
+                void $ shell "sed" [ "-i", "-e", "s/FINDSH/" <> sh'' <> "/g", "bin/ghc-7.10.shim", "bin/ghc-pkg-7.10.shim"]
+    (if isWindows
+        then withSymlink "bin/ghc-7.10.exe" "ghc.exe" . withSymlink "bin/ghc-7.10.shim" "ghc.shim" . withSymlink "bin/ghc-7.10" "ghc"
+        else withSymlink "bin/ghc-7.10" "ghc") $ do
         env <- getTestEnv
         let cwd = testCurrentDir env
         ghc_path <- programPathM ghcProgram
         r <- withEnv [("WITH_GHC", Just ghc_path)]
-           . fails $ setup' "configure" ["-w", cwd </> "ghc"]
+           . fails $ setup' "configure" ["-w", cwd </> if isWindows then "ghc.exe" else "ghc"]
         assertOutputContains "is version 9999999" r
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-7.10.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-7.10.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-7.10.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-7.10.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-7.10.shim
new file mode 100644
index 00000000000..97596f1c171
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-7.10.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "ghc"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-pkg-ghc-7.10.exe b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-pkg-ghc-7.10.exe
new file mode 100644
index 00000000000..537023174dc
Binary files /dev/null and b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-pkg-ghc-7.10.exe differ
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-pkg-ghc-7.10.shim b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-pkg-ghc-7.10.shim
new file mode 100644
index 00000000000..7e9ba24d98b
--- /dev/null
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/bin/ghc-pkg-ghc-7.10.shim
@@ -0,0 +1,2 @@
+path = "FINDSH\sh.exe"
+args = "bin\ghc-pkg-ghc-7.10"
diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/setup.test.hs
index 150f2bc8739..2f406ce6226 100644
--- a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/setup.test.hs
+++ b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/setup.test.hs
@@ -1,10 +1,22 @@
 import Test.Cabal.Prelude
+import System.Directory
 
-main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
-    withSymlink "bin/ghc-7.10" "ghc" $ do
+main = setupAndCabalTest $ do
+    when isWindows $ do
+        sh <- fmap takeDirectory <$> liftIO (findExecutable "sh")
+        case sh of
+            Nothing -> skip "no sh"
+            Just sh' -> do
+                let sh'' = concatMap (\c -> case c of
+                            '\\' -> "\\\\\\\\"
+                            x -> [x]) sh'
+                void $ shell "sed" [ "-i", "-e", "s/FINDSH/" <> sh'' <> "/g", "bin/ghc-7.10.shim", "bin/ghc-pkg-ghc-7.10.shim"]
+    (if isWindows
+        then withSymlink "bin/ghc-7.10.exe" "ghc.exe" . withSymlink "bin/ghc-7.10.shim" "ghc.shim" . withSymlink "bin/ghc-7.10" "ghc"
+        else withSymlink "bin/ghc-7.10" "ghc") $ do
         env <- getTestEnv
         let cwd = testCurrentDir env
         ghc_path <- programPathM ghcProgram
         r <- withEnv [("WITH_GHC", Just ghc_path)]
-           . fails $ setup' "configure" ["-w", cwd </> "ghc"]
+           . fails $ setup' "configure" ["-w", cwd </> if isWindows then "ghc.exe" else "ghc"]
         assertOutputContains "is version 9999999" r