diff --git a/.github/workflows/build_nightly.yml b/.github/workflows/build_nightly.yml
index 75be799cf..1392541a6 100644
--- a/.github/workflows/build_nightly.yml
+++ b/.github/workflows/build_nightly.yml
@@ -894,15 +894,6 @@ jobs:
             _build/tests/cobol85/**/*.out
             _build/tests/cobol85/**/duration.txt
 
-      - name: Adjust testsuite
-        run: |
-          rem Skip test as it sometimes works and sometimes not...
-          rem %MSYS_BASH% -lc "sed -i '/used_binaries/{N;/temporary path invalid/{N;N;N;N;s/traceon/traceon; echo \"workflow:1\">\"$at_check_line_file\"; at_fn_check_skip 77/;}}' tests/testsuite"
-
-          rem Change to expected fail if there's an error specific to the CI that we don't want to change
-          rem in the testsuite for expected result (should normally only be a temporary thing)
-          rem sed -i '/run_fundamental/{N;/Compare FLOAT-LONG with floating-point literal/{N;s/at_xfail=no/at_xfail=yes/;}}' tests/testsuite
-
       - name: Run testsuite
         run: |
           rem To work around regular hangs we run NIST first, then the internal
diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml
index 34dc52bcb..f2e0d4f4c 100644
--- a/.github/workflows/windows-msys2.yml
+++ b/.github/workflows/windows-msys2.yml
@@ -150,7 +150,7 @@ jobs:
           # command it provides, to workaround a diff bug under the MSYS2 CI ;
           # this no longer seems necessary today
           # PATH="$PATH:/c/Program Files/Git/usr/bin"
-          ../configure $CFGOPT CFLAGS=-std=c17
+          ../configure $CFGOPT CFLAGS=-std=gnu17 LDFLAGS=-lintl
 
       - name: Upload config.log
         if: ${{ !cancelled() }}
@@ -185,12 +185,6 @@ jobs:
             _build/tests/cobol85/**/*.out
             _build/tests/cobol85/**/duration.txt
 
-      - name: Adjust testsuite
-        shell: msys2 {0}
-        run: |
-          # Skip test as it sometimes works and sometimes not...
-          # sed -i '/used_binaries/{N;/temporary path invalid/{N;N;N;N;s/traceon/traceon; echo "workflow:1">"$at_check_line_file"; at_fn_check_skip 77/;}}' tests/testsuite
-
       - name: Run testsuite
         shell: msys2 {0}
         run: |