diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/all.T b/testsuite/tests/ghc-regress/codeGen/should_compile/all.T
index d9535d27bb66b5e2beb09150533815ad662ee161..9e254346cfb179e15f9417e792550c61600b5e3c 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/all.T
+++ b/testsuite/tests/ghc-regress/codeGen/should_compile/all.T
@@ -1,8 +1,8 @@
 test('cg001', only_compiler_types(['ghc']), compile, [''])
 test('cg002', normal, compile, [''])
-test('cg003', only_ways(['opt']), compile, ['-fvia-C'])
+test('cg003', only_ways(['optc','optasm']), compile, ['-fvia-C'])
 test('cg004', normal, compile, [''])
-test('cg005', only_ways(['opt']), compile, [''])
+test('cg005', only_ways(['optc','optasm']), compile, [''])
 test('cg006', normal, compile, [''])
 
 test('1916', normal, compile, [''])
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/all.T b/testsuite/tests/ghc-regress/codeGen/should_run/all.T
index 84b910d2a68802e5d8cb15af29b7755305a7a1e1..af98bc64f3e5d81ba872f8b52ad514e3d57e7a1c 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/all.T
+++ b/testsuite/tests/ghc-regress/codeGen/should_run/all.T
@@ -48,7 +48,7 @@ test('cg049', normal, compile_and_run, ['-funbox-strict-fields'])
 test('cg050', normal, compile_and_run, [''])
 # Doesn't work with External Core due to datatype declaration with no constructors
 test('cg051', (compose (expect_fail_for(['extcore','optextcore']),exit_code(1))), compile_and_run, [''])
-test('cg052', only_ways(['opt']), compile_and_run, ['-funbox-strict-fields'])
+test('cg052', only_ways(['optc','optasm']), compile_and_run, ['-funbox-strict-fields'])
 test('cg053', normal, compile_and_run, [''])
 test('cg054', normal, compile_and_run, [''])
 test('cg055', normal, compile_and_run, [''])
diff --git a/testsuite/tests/ghc-regress/cpranal/should_compile/all.T b/testsuite/tests/ghc-regress/cpranal/should_compile/all.T
index 69598c7182c8812fe972208686688598cee40245..f996d242c95ea5ff2c8b8db841241ad63dfa8bea 100644
--- a/testsuite/tests/ghc-regress/cpranal/should_compile/all.T
+++ b/testsuite/tests/ghc-regress/cpranal/should_compile/all.T
@@ -1,6 +1,6 @@
 # Just do the opt way...
 def f( opts ):
-  opts.only_ways = ['opt']
+  opts.only_ways = ['optc','optasm']
 
 setTestOpts(f)
 
diff --git a/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T b/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T
index 195208a9ace8f0a0b1f7e1bfca3d6de496428231..be473850b8f759e67b3ccdfcfae1fd7cc0c79edb 100644
--- a/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T
+++ b/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T
@@ -1,2 +1,2 @@
-test('haddock.Test', compose(omit_ways(['opt', 'optasm', 'profasm']), normal), multimod_compile, ['Test Hidden Visible', '-fglasgow-exts -haddock -ddump-parsed'])
+test('haddock.Test', compose(omit_ways(['optc', 'optasm', 'profasm']), normal), multimod_compile, ['Test Hidden Visible', '-fglasgow-exts -haddock -ddump-parsed'])
 clean(['Test.hi', 'Test.o', 'Hidden.hi', 'Hidden.o', 'Visible.hi', 'Visible.o'])
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/all.T b/testsuite/tests/ghc-regress/indexed-types/should_compile/all.T
index edcb941a968a8ebebb5d1eba34a8d9e6d0324316..2c069434aa60d3b91a30bda0947b8cc6cef9935e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/all.T
+++ b/testsuite/tests/ghc-regress/indexed-types/should_compile/all.T
@@ -1,5 +1,5 @@
 setTestOpts(only_compiler_types(['ghc']))
-setTestOpts(omit_ways(['opt', 'optasm', 'hpc']))
+setTestOpts(omit_ways(['optc', 'optasm', 'hpc']))
 
 test('Simple1', normal, compile, [''])
 test('Simple2', normal, compile, [''])
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/all.T b/testsuite/tests/ghc-regress/indexed-types/should_fail/all.T
index 78f4df50f0787409203915d3554ab0adc5fca6ac..0741aadebaa760ee13f3e26e5673fb405ac4884a 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/all.T
+++ b/testsuite/tests/ghc-regress/indexed-types/should_fail/all.T
@@ -1,5 +1,5 @@
 setTestOpts(only_compiler_types(['ghc']))
-setTestOpts(omit_ways(['opt', 'optasm']))
+setTestOpts(omit_ways(['optc', 'optasm']))
 
 test('Simple1a', normal, compile_fail, [''])
 test('Simple1b', normal, compile_fail, [''])
diff --git a/testsuite/tests/ghc-regress/lib/Generics/all.T b/testsuite/tests/ghc-regress/lib/Generics/all.T
index 228af73adef1673566953c2f825374775d67a5b7..a4452efbfbc0bb186499a8fec081eafbb48e26e9 100644
--- a/testsuite/tests/ghc-regress/lib/Generics/all.T
+++ b/testsuite/tests/ghc-regress/lib/Generics/all.T
@@ -2,7 +2,7 @@ setTestOpts(only_compiler_types(['ghc']))
 
 test('newtype',          normal, compile_and_run, [''])
 test('datatype',         normal, compile_and_run, ['-package containers'])
-test('encode',           omit_ways(['opt','optasm']), compile, [''])
+test('encode',           omit_ways(['optc','optasm']), compile, [''])
 test('ext',              normal, compile,         [''])
 test('getC',             normal, compile_and_run, [''])
 test('where',            normal, compile_and_run, [''])
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/all.T b/testsuite/tests/ghc-regress/simplCore/should_compile/all.T
index 06327f145040681a7747434f3bbffba43c50f615..49085c99b9c6ca480b7f28eef41c0aa95b7969d9 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/all.T
+++ b/testsuite/tests/ghc-regress/simplCore/should_compile/all.T
@@ -15,7 +15,7 @@ test('simpl011', normal, compile, [''])
 test('simpl012', normal, compile, [''])
 test('simpl013', normal, compile, [''])
 test('simpl014', normal, compile, [''])
-test('simpl015', only_ways(['opt']), compile, [''])
+test('simpl015', only_ways(['optc','optasm']), compile, [''])
 test('simpl016', normal, compile, [''])
 test('simpl017', normal, compile, [''])
 test('simpl018', normal, compile, [''])
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/all.T b/testsuite/tests/ghc-regress/stranal/should_compile/all.T
index 52e5de5d6c8ebceba6184495f3f8a08b7daba982..b9a8293d9daba3fc97093c801f9f06e30085bc73 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/all.T
+++ b/testsuite/tests/ghc-regress/stranal/should_compile/all.T
@@ -1,5 +1,5 @@
 # Only compile with optimisation
-setTestOpts( only_ways(['opt']) )
+setTestOpts( only_ways(['optc','optasm']) )
 
 test('default', normal, compile, [''])
 test('fact', normal, compile, [''])
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/all.T b/testsuite/tests/ghc-regress/stranal/should_run/all.T
index dabb211683ea7db0e571ff76829696ed9fc96f93..1117983537cfe7560c951a57d181f1cc91ee2a15 100644
--- a/testsuite/tests/ghc-regress/stranal/should_run/all.T
+++ b/testsuite/tests/ghc-regress/stranal/should_run/all.T
@@ -1,5 +1,5 @@
 # Optimised only, we're testing the strictness analyser here
-setTestOpts( only_ways(['opt']) )
+setTestOpts( only_ways(['optc','optasm']) )
 
 test('strun001', normal, compile_and_run, [''])
 test('strun002', exit_code(1), compile_and_run, [''])
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T b/testsuite/tests/ghc-regress/typecheck/should_compile/all.T
index 77488880d7b5e3faffd5bec84a462ce9203e347b..6c5dab4973029d3d8c64f98acaad7905c2dfcc23 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T
+++ b/testsuite/tests/ghc-regress/typecheck/should_compile/all.T
@@ -175,8 +175,8 @@ test('tc169', normal, compile, [''])
 # which we do by steam here, with a pair of tests.  Make sure
 # we run one way only, so we can be sure to have the right kind
 # of interface file for the second part of the test.
-test('Tc170_Aux', compose(no_clean, only_ways(['opt'])), compile, [''])
-test('tc170', only_ways(['opt']), compile, [''])
+test('Tc170_Aux', compose(no_clean, only_ways(['optc','optasm'])), compile, [''])
+test('tc170', only_ways(['optc','optasm']), compile, [''])
 clean(['Tc170_Aux.comp.stderr', 'Tc170_Aux.hi', 'Tc170_Aux.o'])
 
 test('tc171', normal, compile, [''])