diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 49a818154..d6a084bae 100755
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,19 +15,12 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         args:
-        # Missing some packages now
-        #- "--resolver nightly"
+        - "--resolver nightly"
+        - "--resolver lts-19"
+        - "--resolver lts-18"
         - "--resolver lts-17"
         - "--resolver lts-16"
         - "--resolver lts-14 --stack-yaml stack-lts-14.yaml"
-        # Bugs in GHC make it crash too often to be worth running
-        exclude:
-          - os: windows-latest
-            args: "--resolver nightly"
-          - os: windows-latest
-            args: "--resolver lts-17"
-          - os: windows-latest
-            args: "--resolver lts-16"
 
     steps:
       - name: Clone project
@@ -48,4 +41,9 @@ jobs:
             set -ex
             stack upgrade
             stack --version
-            stack test --no-terminal ${{ matrix.args }} --haddock --no-haddock-deps --bench --no-run-benchmarks
+            EXTRA=""
+            if [[ ${{ matrix.os }} = "windows-latest" ]]
+            then
+              EXTRA="--no-run-tests"
+            fi
+            stack test --no-terminal ${{ matrix.args }} --haddock --no-haddock-deps --bench --no-run-benchmarks $EXTRA
diff --git a/wai-extra/Network/Wai/Handler/CGI.hs b/wai-extra/Network/Wai/Handler/CGI.hs
index c4088d015..e863baaed 100755
--- a/wai-extra/Network/Wai/Handler/CGI.hs
+++ b/wai-extra/Network/Wai/Handler/CGI.hs
@@ -31,11 +31,11 @@ import qualified Network.HTTP.Types as H
 import Network.Socket (addrAddress, getAddrInfo)
 import Network.Wai
 import Network.Wai.Internal
+import System.IO (Handle)
+import qualified System.IO
 #if WINDOWS
 import System.Environment (getEnvironment)
 #else
-import System.IO (Handle)
-import qualified System.IO
 import qualified System.Posix.Env.ByteString as Env
 
 getEnvironment :: IO [(String, String)]