5 files changed, 15 insertions, 41 deletions
diff --git a/testsuite/tests/quasiquotation/all.T b/testsuite/tests/quasiquotation/all.T
index 7e65cba791..84d25f8bdd 100644
--- a/testsuite/tests/quasiquotation/all.T
+++ b/testsuite/tests/quasiquotation/all.T
@@ -1,17 +1,8 @@
 test('T3953', req_interp, compile_fail, [''])
-test('T4150',
-     [
-      expect_broken(4150),
-      extra_clean(['T4150A.hi', 'T4150A.o', 'T4150.hi', 'T4150.o'])],
-     run_command,
+test('T4150', [expect_broken(4150)], run_command,
      ['$MAKE -s --no-print-directory T4150'])
 test('T5204', req_interp, compile_fail, [''])
-test('T7918', 
-      [req_interp,
-       extra_run_opts('"' + config.libdir + '"'),
-       only_ways(config.ghc_th_way),
-       unless(have_dynamic(),skip),
-       extra_clean(['T7918A.hi', 'T7918A.o', 'T7918A.dyn_hi', 'T7918A.dyn_o', 
-                    'T7918B.hi', 'T7918B.o', 'T7918B.dyn_hi', 'T7918B.dyn_o'])],
-      compile_and_run,
-      ['-package ghc ' + config.ghc_th_way_flags])
+test('T7918',
+     [req_interp, extra_run_opts('"' + config.libdir + '"'),
+      only_ways(config.ghc_th_way), unless(have_dynamic(), skip)],
+     compile_and_run, ['-package ghc ' + config.ghc_th_way_flags])
diff --git a/testsuite/tests/quasiquotation/qq006/test.T b/testsuite/tests/quasiquotation/qq006/test.T
index b9cac424e7..e9beadda64 100644
--- a/testsuite/tests/quasiquotation/qq006/test.T
+++ b/testsuite/tests/quasiquotation/qq006/test.T
@@ -1,7 +1,2 @@
-test('qq006',
-     [when(fast(), skip),
-      reqlib('parsec'),
-      extra_clean(['Expr.hi', 'Expr.o']),
-      ],
-     multimod_compile_fail,
+test('qq006', [when(fast(), skip), reqlib('parsec')], multimod_compile_fail,
      ['Main', '-v0'])
diff --git a/testsuite/tests/quasiquotation/qq007/test.T b/testsuite/tests/quasiquotation/qq007/test.T
index dc01dfc3fb..3a2524b771 100644
--- a/testsuite/tests/quasiquotation/qq007/test.T
+++ b/testsuite/tests/quasiquotation/qq007/test.T
@@ -1,8 +1,4 @@
 test('qq007',
-     [when(fast(), skip),
-      extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
-      pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
-      omit_ways(prof_ways),
-      ],
-     multimod_compile,
-     ['Test', '-v0 ' + config.ghc_th_way_flags])
+     [when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
+      omit_ways(prof_ways)],
+     multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags])
diff --git a/testsuite/tests/quasiquotation/qq008/test.T b/testsuite/tests/quasiquotation/qq008/test.T
index 33e00376d5..f0827aa4f0 100644
--- a/testsuite/tests/quasiquotation/qq008/test.T
+++ b/testsuite/tests/quasiquotation/qq008/test.T
@@ -1,8 +1,4 @@
 test('qq008',
-     [when(fast(), skip),
-      extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
-      pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
-      omit_ways(prof_ways),
-      ],
-     multimod_compile,
-     ['Test', '-v0 ' + config.ghc_th_way_flags])
+     [when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
+      omit_ways(prof_ways)],
+     multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags])
diff --git a/testsuite/tests/quasiquotation/qq009/test.T b/testsuite/tests/quasiquotation/qq009/test.T
index fb06834a58..9b355de096 100644
--- a/testsuite/tests/quasiquotation/qq009/test.T
+++ b/testsuite/tests/quasiquotation/qq009/test.T
@@ -1,8 +1,4 @@
 test('qq009',
-     [when(fast(), skip),
-      extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
-      pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
-      omit_ways(prof_ways),
-      ],
-     multimod_compile,
-     ['Test', '-v0 ' + config.ghc_th_way_flags])
+     [when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
+      omit_ways(prof_ways)],
+     multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags])