4 files changed, 11 insertions, 3 deletions
diff --git a/testsuite/tests/cmm/opt/all.T b/testsuite/tests/cmm/opt/all.T
index 0e4fc9abf2..9fdb8a700b 100644
--- a/testsuite/tests/cmm/opt/all.T
+++ b/testsuite/tests/cmm/opt/all.T
@@ -1,5 +1,5 @@
 # Verify that we optimize away conditional branches which always jump
 # to the same target.
-test('T15188', normal, makefile_test, [])
+test('T15188', cmm_src, makefile_test, [])
 test('T18141', normal, compile, [''])
 test('T20142', normal, compile, [''])
diff --git a/testsuite/tests/cmm/should_compile/T21370/all.T b/testsuite/tests/cmm/should_compile/T21370/all.T
index a88bb4d26f..f0df98e111 100644
--- a/testsuite/tests/cmm/should_compile/T21370/all.T
+++ b/testsuite/tests/cmm/should_compile/T21370/all.T
@@ -1 +1,4 @@
-test('T21370', [extra_files(["subdir", "test.cmm", "test2.cmm", "Main.hs"])] , makefile_test, [])
+test('T21370',
+  [ extra_files(["subdir", "test.cmm", "test2.cmm", "Main.hs"])
+  , js_skip # use Cmm
+  ], makefile_test, [])
diff --git a/testsuite/tests/cmm/should_compile/all.T b/testsuite/tests/cmm/should_compile/all.T
index 40813f01ec..ce38d8d9a1 100644
--- a/testsuite/tests/cmm/should_compile/all.T
+++ b/testsuite/tests/cmm/should_compile/all.T
@@ -1,4 +1,7 @@
-#
+setTestOpts(
+  [ js_skip # Cmm not supported by the JS backend
+  ])
+
 test('selfloop', [cmm_src], compile, ['-no-hs-main'])
 test('cmm_sink_sp', [ only_ways(['optasm']), grep_errmsg('(\[Sp.*\]).*(=).*(\[.*R1.*\]).*;',[1,2,3]), cmm_src], compile, ['-no-hs-main -ddump-cmm -dsuppress-uniques -O'])
 
diff --git a/testsuite/tests/cmm/should_run/all.T b/testsuite/tests/cmm/should_run/all.T
index bb667a93de..7290fee784 100644
--- a/testsuite/tests/cmm/should_run/all.T
+++ b/testsuite/tests/cmm/should_run/all.T
@@ -6,6 +6,7 @@ test('HooplPostorder',
 test('cmp64',
      [    extra_run_opts('"' + config.libdir + '"')
      ,    omit_ways(['ghci'])
+     ,    js_skip
      ],
      multi_compile_and_run,
      ['cmp64', [('cmp64_cmm.cmm', '')], '-O'])
@@ -20,6 +21,7 @@ test('cmp64',
 test('ByteSwitch',
      [    extra_run_opts('"' + config.libdir + '"')
      ,    omit_ways(['ghci'])
+     ,    js_skip
      ],
      multi_compile_and_run,
      ['ByteSwitch', [('ByteSwitch_cmm.cmm', '')], ''])