diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 2ac90180e9be00d4c496dfe0cd9feb2d96f8a203..97a5a0d4be313b8a51e3a9f8c2bee441a88af16c 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -336,7 +336,7 @@ def unless(b, f):
 def doing_ghci():
     return 'ghci' in config.run_ways
 
-def ghci_dynamic( ):
+def ghc_dynamic():
     return config.ghc_dynamic
 
 def fast():
diff --git a/testsuite/tests/ghc-e/should_run/all.T b/testsuite/tests/ghc-e/should_run/all.T
index ae286538cc61e9835b2c92796553f2072633a951..a10fb0d816c3e4997b74b99c23394ceb5a339abd 100644
--- a/testsuite/tests/ghc-e/should_run/all.T
+++ b/testsuite/tests/ghc-e/should_run/all.T
@@ -7,7 +7,7 @@ test('ghc-e005', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e0
 test('ghc-e006', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e006'])
 
 test('T2228',
-     [req_interp, when(ghci_dynamic(), expect_broken(7298))],
+     [req_interp, when(ghc_dynamic(), expect_broken(7298))],
      run_command,
      ['$MAKE --no-print-directory -s T2228'])
 test('T2636', req_interp, run_command, ['$MAKE --no-print-directory -s T2636'])
diff --git a/testsuite/tests/ghci/linking/all.T b/testsuite/tests/ghci/linking/all.T
index 7404de3923e670235d9ab95a2802aa763a4fa0aa..369ef284c8eab968f5596d5a51442c9c32a9c04d 100644
--- a/testsuite/tests/ghci/linking/all.T
+++ b/testsuite/tests/ghci/linking/all.T
@@ -1,5 +1,5 @@
 test('ghcilink001',
-     [when(ghci_dynamic(), expect_fail), # dynamic ghci can't load '.a's
+     [when(ghc_dynamic(), expect_fail), # dynamic ghci can't load '.a's
       unless(doing_ghci, skip),
       extra_clean(['dir001/*','dir001'])],
      run_command,
@@ -43,7 +43,7 @@ test('ghcilink006',
 test('T3333',
      [extra_clean(['T3333.o']),
      unless(doing_ghci, skip),
-     unless(opsys('linux') or opsys('darwin') or ghci_dynamic(), expect_broken(3333))],
+     unless(opsys('linux') or opsys('darwin') or ghc_dynamic(), expect_broken(3333))],
      run_command,
      ['$MAKE -s --no-print-directory T3333'])
 
diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T
index ca37fe5704d9009371becea39dbab0c652d6905f..52bd62c16b0c938a8f58546c8f84f43846be654f 100644
--- a/testsuite/tests/profiling/should_run/all.T
+++ b/testsuite/tests/profiling/should_run/all.T
@@ -72,7 +72,7 @@ test('T680',
 
 test('T2552',
      [ req_profiling, extra_ways(['prof']), only_ways(prof_ways),
-       expect_broken_for(10037,['prof'])],
+       expect_broken_for(10037, opt_ways)],
      compile_and_run,
      [''])
 
diff --git a/testsuite/tests/profiling/should_run/callstack002.stderr b/testsuite/tests/profiling/should_run/callstack002.stderr
index b4bb0d5a7a83695a9ac5fa90ba746b3f67868d71..e1f249a7f9618e6b5d7743bd57d78ede11811bb7 100644
--- a/testsuite/tests/profiling/should_run/callstack002.stderr
+++ b/testsuite/tests/profiling/should_run/callstack002.stderr
@@ -1,5 +1,5 @@
 f: 42
-Stack trace:
+CallStack (from -prof):
   Main.f (callstack002.hs:10:7-43)
   Main.map.go (callstack002.hs:15:21-23)
   Main.map.go (callstack002.hs:15:21-34)
@@ -7,7 +7,7 @@ Stack trace:
   Main.main.xs (callstack002.hs:18:12-24)
   Main.CAF (<entire-module>)
 f: 43
-Stack trace:
+CallStack (from -prof):
   Main.f (callstack002.hs:10:7-43)
   Main.map.go (callstack002.hs:15:21-23)
   Main.map.go (callstack002.hs:15:21-34)
diff --git a/testsuite/tests/profiling/should_run/callstack002.stdout b/testsuite/tests/profiling/should_run/callstack002.stdout
index 480090de4ed59b84e5b3330790163480ff1ecfca..8116c2c70964721891ab5435d39a7defd20abea5 100644
--- a/testsuite/tests/profiling/should_run/callstack002.stdout
+++ b/testsuite/tests/profiling/should_run/callstack002.stdout
@@ -1,5 +1,5 @@
 [84,86]
-Stack trace:
+CallStack (from -prof):
   Main.f (callstack002.hs:10:38-42)
   Main.f (callstack002.hs:10:7-43)
   Main.map.go (callstack002.hs:15:21-23)
diff --git a/testsuite/tests/th/Makefile b/testsuite/tests/th/Makefile
index 4fb508f394072b31978c69d356dfceb6a8ba406d..5e47e8cda7e3748c4924feb98ddbb8c4a7442b23 100644
--- a/testsuite/tests/th/Makefile
+++ b/testsuite/tests/th/Makefile
@@ -16,7 +16,7 @@ HC_OPTS = -XTemplateHaskell -package template-haskell
 
 TH_spliceE5_prof::
 	$(RM) TH_spliceE5_prof*.o TH_spliceE5_prof*.hi TH_spliceE5_prof*.dyn_o TH_spliceE5_prof*.dyn_hi TH_spliceE5_prof
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) $(ghcThWayFlags) --make -v0 TH_spliceE5_prof.hs -c
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) $(ghcThWayFlags) --make -no-link -v0 TH_spliceE5_prof.hs
 	# Using `-osuf .p.o` should work. Note the dot before the `p` (#9760), and
 	# the dot between the `p` and the `o` (#5554).
 	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) --make -v0 TH_spliceE5_prof.hs -prof -auto-all -osuf .p.o -o $@
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index 8b38e3f4022096f163a8266b183c57df04e6af49..db6ee4e399957b6bd4f8929205eb98f5dfa6e75a 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -45,7 +45,7 @@ test('TH_NestedSplices',
 # normal way first, which is why the work is done by a Makefile rule.
 test('TH_spliceE5_prof',
      [req_profiling,
-      omit_ways(['ghci']),
+      when(ghc_dynamic(), expect_broken(11495)),
       extra_clean(['TH_spliceE5_prof_Lib.p.o', 'TH_spliceE5_prof_Lib.hi',
                    'TH_spliceE5_prof_Lib.dyn_o', 'TH_spliceE5_prof_Lib.dyn_hi',
                    'TH_spliceE5_prof.dyn_o', 'TH_spliceE5_prof.dyn_hi',