diff --git a/testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout b/testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout
index b84fede1be9f..9253d5ea643d 100644
--- a/testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout
+++ b/testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout
@@ -4,8 +4,6 @@ Building library 'p' instantiated with
   B = <B>
 for bkpcabal08-0.1.0.0...
 [2 of 2] Compiling B[sig]           ( p/B.hsig, nothing )
-Preprocessing library 'impl' for bkpcabal08-0.1.0.0...
-Building library 'impl' for bkpcabal08-0.1.0.0...
 Preprocessing library 'q' for bkpcabal08-0.1.0.0...
 Building library 'q' instantiated with
   A = <A>
@@ -14,6 +12,8 @@ for bkpcabal08-0.1.0.0...
 [2 of 4] Compiling B[sig]           ( q/B.hsig, nothing )
 [3 of 4] Compiling M                ( q/M.hs, nothing ) [A changed]
 [4 of 4] Instantiating bkpcabal08-0.1.0.0-LjROTJ30vjpHLvYNUnY1dD-p
+Preprocessing library 'impl' for bkpcabal08-0.1.0.0...
+Building library 'impl' for bkpcabal08-0.1.0.0...
 Preprocessing library 'q' for bkpcabal08-0.1.0.0...
 Building library 'q' instantiated with
   A = bkpcabal08-0.1.0.0-KxkxGUgMJM6Dqo87AQu6V5-impl:A
diff --git a/testsuite/tests/cabal/cabal03/all.T b/testsuite/tests/cabal/cabal03/all.T
index 86c80c57df6d..fbab00cd4e89 100644
--- a/testsuite/tests/cabal/cabal03/all.T
+++ b/testsuite/tests/cabal/cabal03/all.T
@@ -1,5 +1,15 @@
+import re
+
+def drop_callstack(s):
+     # Remove dieProgress call stack blocks (Cabal commit eab5a10d0b...).
+     # Also remove the preceding blank line (if any) to avoid leaving an extra blank.
+     s = re.sub(r'(?ms)\n?\s*CallStack \(from HasCallStack\):\n(?:\s+.*\n)*', '\n', s)
+     # Collapse any runs of >1 blank line to a single newline.
+     return re.sub(r'\n{3,}', '\n\n', s)
+
 test('cabal03',
      [extra_files(['Setup.lhs', 'p/', 'q/', 'r/']),
-     js_broken(22349)],
+      js_broken(22349),
+      normalise_errmsg_fun(drop_callstack)],
      makefile_test,
      [])
diff --git a/testsuite/tests/ghci/T13786/all.T b/testsuite/tests/ghci/T13786/all.T
index 6701a4dfbfb2..e141aea4b6ae 100644
--- a/testsuite/tests/ghci/T13786/all.T
+++ b/testsuite/tests/ghci/T13786/all.T
@@ -1,4 +1,4 @@
 test('T13786',
-     [when(unregisterised(), fragile(17018)), req_c, when(opsys('linux') and not ghc_dynamic(), expect_broken(20706))],
+     [when(unregisterised(), fragile(17018)), req_c],
      makefile_test, [])
 
diff --git a/testsuite/tests/package/T20010/all.T b/testsuite/tests/package/T20010/all.T
index d7b04b629f42..9c02e14214c3 100644
--- a/testsuite/tests/package/T20010/all.T
+++ b/testsuite/tests/package/T20010/all.T
@@ -1,4 +1,10 @@
 # Test that GHC links to the C++ standard library as expected
 # when the system-cxx-std-lib package is used.
 test('T20010', req_c, makefile_test, [])
-test('T20010-ghci', [req_c, extra_files(['T20010_c.cpp', 'T20010.hs']), when(opsys('linux') and not ghc_dynamic(), expect_broken(20706))], makefile_test, [])
+test('T20010-ghci', [req_c, extra_files(['T20010_c.cpp', 'T20010.hs']),
+                     # this test is broken for dynamic builds.  However, windows
+                     # is dynamic, but not really, and works significanlty
+                     # different from linux and darwin to not be broken when
+                     # ghc claims to be dynamic.
+                     unless(ghc_dynamic() and not opsys('mingw32'), expect_broken(20706))],
+     makefile_test, [])
diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T
index 012bce59572a..61f754f6455b 100644
--- a/testsuite/tests/plugins/all.T
+++ b/testsuite/tests/plugins/all.T
@@ -355,7 +355,8 @@ test('test-echo-in-line-many-args',
 test('plugins-external',
      [extra_files(['shared-plugin/']),
       pre_cmd('$MAKE -s --no-print-directory -C shared-plugin package.plugins01 TOP={top}'),
-      when(opsys('mingw32') or (opsys('linux') and not ghc_dynamic()), expect_broken(20706))],
+      unless(ghc_dynamic(), skip),
+      when(opsys('mingw32'), expect_broken(20706))],
      makefile_test, [])
 
 test('test-phase-hooks-plugin',