diff --git a/testsuite/tests/gadt/all.T b/testsuite/tests/gadt/all.T
index 40f80afb08a90203e8374d20eb4d12966266f9c8..c00c1f1ee132591f060c571b4b56add46f0d5178 100644
--- a/testsuite/tests/gadt/all.T
+++ b/testsuite/tests/gadt/all.T
@@ -127,7 +127,7 @@ test('T20485', normal, compile, [''])
 test('T20485a', normal, compile, [''])
 test('T22235', normal, compile, [''])
 test('T19847', normal, compile, [''])
-test('T19847a', normal, compile, ['-ddump-types'])
+test('T19847a', normalise_version('base'), compile, ['-ddump-types'])
 test('T19847b', normal, compile, [''])
 test('T23022', normal, compile, ['-dcore-lint'])
 test('T23023', normal, compile_fail, ['-O -dcore-lint']) # todo: move this test?
diff --git a/testsuite/tests/ghc-api/T20757.stderr b/testsuite/tests/ghc-api/T20757.stderr
index 4210a9e41350858d3cb4f75a58b2ee2947312cd8..b7fc4ce4b86004e672ec536be442a430b7d94d48 100644
--- a/testsuite/tests/ghc-api/T20757.stderr
+++ b/testsuite/tests/ghc-api/T20757.stderr
@@ -2,11 +2,11 @@ T20757: Exception:
 
 could not detect mingw toolchain in the following paths: ["/..//mingw","/..//..//mingw","/..//..//..//mingw"]
 
-Package: ghc-inplace
+Package: ghc-<VERSION>-<HASH>
 Module: GHC.Utils.Panic
 Type: GhcException
 
 HasCallStack backtrace:
   collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:<line>:<column> in <package-id>:GHC.Internal.Exception
   toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:<line>:<column> in <package-id>:GHC.Internal.IO
-  throwIO, called at compiler/GHC/Utils/Panic.hs:<line>:<column> in <package-id>:GHC.Utils.Panic
+  throwIO, called at compiler/GHC/Utils/Panic.hs:183:23 in ghc-<VERSION>-<HASH>:GHC.Utils.Panic
diff --git a/testsuite/tests/ghc-api/all.T b/testsuite/tests/ghc-api/all.T
index 34ea1b84c6c43604a83666b8a606a7ccbe54994c..39185a789935aba03f57564b9bb3e1dd29aa4271 100644
--- a/testsuite/tests/ghc-api/all.T
+++ b/testsuite/tests/ghc-api/all.T
@@ -36,7 +36,7 @@ test('T19156', [ extra_run_opts('"' + config.libdir + '"')
                ],
                compile_and_run,
                ['-package ghc'])
-test('T20757', [unless(opsys('mingw32'), skip), exit_code(1)],
+test('T20757', [unless(opsys('mingw32'), skip), exit_code(1), normalise_version('ghc')],
                compile_and_run,
                ['-package ghc'])
 test('PrimOpEffect_Sanity', normal, compile_and_run, ['-Wall -Werror -package ghc'])
diff --git a/testsuite/tests/ghc-e/should_fail/all.T b/testsuite/tests/ghc-e/should_fail/all.T
index ee060070197326e13b1f05d1233e12a3d9fabd26..cbdcd19f994df57f0eb5cbf1d1e1fa297418ecfa 100644
--- a/testsuite/tests/ghc-e/should_fail/all.T
+++ b/testsuite/tests/ghc-e/should_fail/all.T
@@ -15,6 +15,7 @@ test('ghc-e-fail2', req_interp, makefile_test, ['ghc-e-fail2'])
 test('T9930fail',
      [extra_files(['T9930']),
       when(opsys('mingw32'), skip),
+      normalise_version('ghc'),
       # broken for JS until cross-compilers become stage2 compilers (#19174)
       # or until we bootstrap with a 9.10 compiler
       js_broken(19174)],
@@ -24,7 +25,7 @@ test('T18441fail0', req_interp, makefile_test, ['T18441fail0'])
 
 test('T18441fail1', req_interp, makefile_test, ['T18441fail1'])
 
-test('T18441fail2', req_interp, makefile_test, ['T18441fail2'])
+test('T18441fail2', [req_interp, normalise_version('ghc')], makefile_test, ['T18441fail2'])
 
 test('T18441fail3', [ignore_stderr, exit_code(1)], run_command, ['{compiler} -e ":! abcde"'])
 
@@ -34,9 +35,9 @@ test('T18441fail5', req_interp, makefile_test, ['T18441fail5'])
 
 test('T18441fail6', req_interp, makefile_test, ['T18441fail6'])
 
-test('T18441fail7', req_interp, makefile_test, ['T18441fail7'])
+test('T18441fail7', [req_interp, normalise_version('ghc')], makefile_test, ['T18441fail7'])
 
-test('T18441fail8', req_interp, makefile_test, ['T18441fail8'])
+test('T18441fail8', [req_interp, normalise_version('ghc')], makefile_test, ['T18441fail8'])
 
 test('T18441fail9', req_interp, makefile_test, ['T18441fail9'])
 
@@ -60,6 +61,6 @@ test('T18441fail18', req_interp, makefile_test, ['T18441fail18'])
 
 test('T18441fail19', [ignore_stderr, exit_code(1)], run_command, ['{compiler} -e ":cd abcd"'])
 
-test('T23663', req_interp, makefile_test, ['T23663'])
+test('T23663', [req_interp, normalise_version('ghc')], makefile_test, ['T23663'])
 
 test('T24172', normal, compile_fail, ['-fdiagnostics-color=always'])