11 files changed, 28 insertions, 12 deletions
diff --git a/testsuite/tests/backpack/cabal/T15594/all.T b/testsuite/tests/backpack/cabal/T15594/all.T
index 1978865665..0521c9e883 100644
--- a/testsuite/tests/backpack/cabal/T15594/all.T
+++ b/testsuite/tests/backpack/cabal/T15594/all.T
@@ -4,6 +4,6 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('T15594',
-     extra_files(['Setup.hs', 'Stuff.hs', 'Sig.hsig', 'pkg.cabal', 'src']),
+     [extra_files(['Setup.hs', 'Stuff.hs', 'Sig.hsig', 'pkg.cabal', 'src']), js_skip],
      run_command,
      ['$MAKE -s --no-print-directory T15594 ' + cleanup])
diff --git a/testsuite/tests/backpack/cabal/T16219/all.T b/testsuite/tests/backpack/cabal/T16219/all.T
index dc53deb2be..aba30e82f8 100644
--- a/testsuite/tests/backpack/cabal/T16219/all.T
+++ b/testsuite/tests/backpack/cabal/T16219/all.T
@@ -5,6 +5,8 @@ else:
 
 test('T16219',
      [extra_files(['Setup.hs', 'backpack-issue.cabal', 'library-a', 'library-a-impl', 'library-b']),
-      when(opsys('mingw32'), fragile(17452))],
+      when(opsys('mingw32'), fragile(17452)),
+      js_skip
+     ],
      run_command,
      ['$MAKE -s --no-print-directory T16219 ' + cleanup])
diff --git a/testsuite/tests/backpack/cabal/T20509/all.T b/testsuite/tests/backpack/cabal/T20509/all.T
index d94879a8d7..119379a2c7 100644
--- a/testsuite/tests/backpack/cabal/T20509/all.T
+++ b/testsuite/tests/backpack/cabal/T20509/all.T
@@ -4,7 +4,9 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('T20509',
-     [extra_files(['p', 'q', 'T20509.cabal', 'Setup.hs']),
-      run_timeout_multiplier(2)],
+     [extra_files(['p', 'q', 'T20509.cabal', 'Setup.hs'])
+     , run_timeout_multiplier(2)
+     , js_skip
+     ],
      run_command,
      ['$MAKE -s --no-print-directory T20509 ' + cleanup])
diff --git a/testsuite/tests/cabal/T12733/all.T b/testsuite/tests/cabal/T12733/all.T
index a9cf30f441..6ffbf9f714 100644
--- a/testsuite/tests/cabal/T12733/all.T
+++ b/testsuite/tests/cabal/T12733/all.T
@@ -4,6 +4,8 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('T12733',
-     extra_files(['p/', 'q/', 'Setup.hs']),
+     [extra_files(['p/', 'q/', 'Setup.hs'])
+     , js_skip
+     ],
      run_command,
      ['$MAKE -s --no-print-directory T12733 ' + cleanup])
diff --git a/testsuite/tests/cabal/t18567/all.T b/testsuite/tests/cabal/t18567/all.T
index 5b30bfaaf9..385dfc647e 100644
--- a/testsuite/tests/cabal/t18567/all.T
+++ b/testsuite/tests/cabal/t18567/all.T
@@ -4,6 +4,8 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('T18567',
-     extra_files(['Setup.hs', 'sublib/', 'sublib-unused', 'src/', 'internal-lib.cabal']),
+     [ extra_files(['Setup.hs', 'sublib/', 'sublib-unused', 'src/', 'internal-lib.cabal'])
+     , js_skip
+     ],
      run_command,
      ['$MAKE -s --no-print-directory T18567 ' + cleanup])
diff --git a/testsuite/tests/cabal/t19518/all.T b/testsuite/tests/cabal/t19518/all.T
index a2cd241a70..ab7aa1293b 100644
--- a/testsuite/tests/cabal/t19518/all.T
+++ b/testsuite/tests/cabal/t19518/all.T
@@ -4,6 +4,8 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('t19518',
-     extra_files(['Setup.hs', 'p/', 'q/', 'r/']),
+     [ extra_files(['Setup.hs', 'p/', 'q/', 'r/'])
+     , js_skip
+     ],
      run_command,
      ['$MAKE -s --no-print-directory t19518 ' + cleanup])
diff --git a/testsuite/tests/driver/T1372/all.T b/testsuite/tests/driver/T1372/all.T
index 0edd81d622..d33a3171e3 100644
--- a/testsuite/tests/driver/T1372/all.T
+++ b/testsuite/tests/driver/T1372/all.T
@@ -1 +1 @@
-test('T1372', [extra_files(['p1/', 'p2/'])], makefile_test, ['T1372'])
+test('T1372', [extra_files(['p1/', 'p2/']), js_skip], makefile_test, ['T1372'])
diff --git a/testsuite/tests/driver/T3007/all.T b/testsuite/tests/driver/T3007/all.T
index d0442712e9..c233003331 100644
--- a/testsuite/tests/driver/T3007/all.T
+++ b/testsuite/tests/driver/T3007/all.T
@@ -1,3 +1,5 @@
 test('T3007',
-     [extra_files(['A/', 'B/'])],
+     [ extra_files(['A/', 'B/'])
+     , js_skip
+     ],
      makefile_test, [])
diff --git a/testsuite/tests/driver/multipleHomeUnits/different-db/all.T b/testsuite/tests/driver/multipleHomeUnits/different-db/all.T
index 5661d6a017..930efd1a7a 100644
--- a/testsuite/tests/driver/multipleHomeUnits/different-db/all.T
+++ b/testsuite/tests/driver/multipleHomeUnits/different-db/all.T
@@ -4,6 +4,8 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('different-db',
-     extra_files(['p/', 'q/', 'r/', 'p1/', 'unitP', 'unitQ', 'unitR', 'unitP1', 'Setup.hs']),
+     [ extra_files(['p/', 'q/', 'r/', 'p1/', 'unitP', 'unitQ', 'unitR', 'unitP1', 'Setup.hs'])
+     , js_skip
+     ],
      run_command,
      ['$MAKE -s --no-print-directory different-db ' + cleanup])
diff --git a/testsuite/tests/driver/multipleHomeUnits/mhu-closure/all.T b/testsuite/tests/driver/multipleHomeUnits/mhu-closure/all.T
index 16fb06efa9..ce22fc3dd8 100644
--- a/testsuite/tests/driver/multipleHomeUnits/mhu-closure/all.T
+++ b/testsuite/tests/driver/multipleHomeUnits/mhu-closure/all.T
@@ -4,6 +4,8 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('mhu-closure',
-     extra_files(['p/', 'q/', 'r/', 'r1/', 'unitP', 'unitQ', 'unitR', 'unitR1', 'Setup.hs']),
+     [ extra_files(['p/', 'q/', 'r/', 'r1/', 'unitP', 'unitQ', 'unitR', 'unitR1', 'Setup.hs'])
+     , js_skip
+     ],
      run_command,
      ['$MAKE -s --no-print-directory mhu-closure ' + cleanup])
diff --git a/testsuite/tests/driver/package-imports-t20779/all.T b/testsuite/tests/driver/package-imports-t20779/all.T
index c6fc03d5f1..7d15ba7e89 100644
--- a/testsuite/tests/driver/package-imports-t20779/all.T
+++ b/testsuite/tests/driver/package-imports-t20779/all.T
@@ -1,4 +1,4 @@
 test('package-imports-20779', [extra_files(['q-1', 'q-2', 'q-3', 'p', 'Setup.hs']),
-                   when(fast(), skip)],
+                   when(fast(), skip), js_skip],
      makefile_test,
      [])