diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e84bddcbd8..20909b03a1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,8 +21,6 @@ jobs:
         exclude:
           - os: windows-latest
             ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550
-          - os: windows-latest
-            ghc: '8.8.4' # also fails due to segfault :(
           - os: windows-latest
             ghc: '8.8.3' # fails due to segfault
         include:
@@ -81,6 +79,12 @@ jobs:
         echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
         sudo rm -rf /Library/Developer/CommandLineTools
 
+    - name: Modify cabal.project to workaround segfaults for ghc-8.8.4 and windows
+      if: matrix.ghc == '8.8.4' && matrix.os == 'windows-latest'
+      run: |
+          echo "package floskell" >> cabal.project
+          echo "  ghc-options: -O0" >> cabal.project
+
     - name: Build Server
       # Try building it twice in case of flakey builds on Windows
       run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c2b1d7e87a..d80bf70778 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -67,10 +67,12 @@ jobs:
             ghc: '8.10.4'
           - os: windows-latest
             ghc: '8.10.3'
+          - os: windows-latest
+            ghc: '8.8.4'
           # These builds get stuck frequently
           # - os: windows-latest
           #   ghc: '8.10.2.2'
-          
+
           # - os: windows-latest
           #   ghc: '8.6.4'
 
@@ -101,7 +103,7 @@ jobs:
           echo "CABAL_STORE_DIR=~/.cabal/store" >> $GITHUB_ENV
           echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
 
-      - name: Tentative Workaround for GHC 8.10.5 on macOS
+      - name: Workaround for GHC 8.10.5 on macOS
         if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
         run: |
           echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
@@ -112,6 +114,12 @@ jobs:
         name: Use modified cabal.project for ghc9
         run: cp cabal-ghc901.project cabal.project
 
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.ghc == '8.8.4' && matrix.os == 'windows-latest' }}
+        name: Modify cabal.project to workaround segfaults for ghc-8.8.4 and windows
+        run: |
+          echo "package floskell" >> cabal.project
+          echo "  ghc-options: -O0" >> cabal.project
+
       - if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
         name: Cache Cabal
         uses: actions/cache@v2