diff --git a/test/built-ins/Atomics/add/bad-range.js b/test/built-ins/Atomics/add/bad-range.js
index e220affe3a42ae6dae1406be1978f459e621358a..cfac2ccb8665f13501c944b1a4a139ea7df84a47 100644
--- a/test/built-ins/Atomics/add/bad-range.js
+++ b/test/built-ins/Atomics/add/bad-range.js
@@ -15,10 +15,8 @@ var views = intArrayConstructors.slice();
 testWithTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(
-      RangeError,
-      () => Atomics.add(view, IdxGen(view), 10),
-      'Atomics.add(view, IdxGen(view), 10) throws RangeError'
-    );
+    assert.throws(RangeError, function() {
+      Atomics.add(view, IdxGen(view), 10);
+    }, 'Atomics.add(view, IdxGen(view), 10) throws RangeError');
   });
 }, views);
diff --git a/test/built-ins/Atomics/add/bigint/bad-range.js b/test/built-ins/Atomics/add/bigint/bad-range.js
index 2cb1260dde3a698acc741d03c7b456e8c5090d27..ad275c969642396d0dd9402ccef82e74862a52e9 100644
--- a/test/built-ins/Atomics/add/bigint/bad-range.js
+++ b/test/built-ins/Atomics/add/bigint/bad-range.js
@@ -14,10 +14,8 @@ var buffer = new SharedArrayBuffer(8);
 testWithBigIntTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(
-      RangeError,
-      () => Atomics.add(view, IdxGen(view), 10),
-      'Atomics.add(view, IdxGen(view), 10) throws RangeError'
-    );
+    assert.throws(RangeError, function() {
+      Atomics.add(view, IdxGen(view), 10);
+    }, 'Atomics.add(view, IdxGen(view), 10) throws RangeError');
   });
 });
diff --git a/test/built-ins/Atomics/add/bigint/nonshared-int-views.js b/test/built-ins/Atomics/add/bigint/nonshared-int-views.js
index 033e733168b535b8f5db91a1c9184030d3f0b32e..72d796fd2e4faf32ec496a802c7fa72ebe1aad27 100644
--- a/test/built-ins/Atomics/add/bigint/nonshared-int-views.js
+++ b/test/built-ins/Atomics/add/bigint/nonshared-int-views.js
@@ -12,9 +12,7 @@ features: [ArrayBuffer, arrow-function, Atomics, BigInt, TypedArray]
 var ab = new ArrayBuffer(16);
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.add(new TA(ab), 0, 0),
-    'Atomics.add(new TA(ab), 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.add(new TA(ab), 0, 0);
+  }, 'Atomics.add(new TA(ab), 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/add/non-views.js b/test/built-ins/Atomics/add/non-views.js
index 5eece9cb81bb6c04cdf8e97d3a371a191300c2ab..82711c52ab78dc50f0e323d645b698234ae3ec7c 100644
--- a/test/built-ins/Atomics/add/non-views.js
+++ b/test/built-ins/Atomics/add/non-views.js
@@ -10,9 +10,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 testWithAtomicsNonViewValues(function(view) {
-  assert.throws(
-    TypeError,
-    () => Atomics.add(view, 0, 0),
-    'Atomics.add(view, 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.add(view, 0, 0);
+  }, 'Atomics.add(view, 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/add/nonshared-int-views.js b/test/built-ins/Atomics/add/nonshared-int-views.js
index 441b422ecc71259c67a8569faf1975fd4e904a38..b09f1b7c2f11e3e7caaa4d5cac0b80df139610a5 100644
--- a/test/built-ins/Atomics/add/nonshared-int-views.js
+++ b/test/built-ins/Atomics/add/nonshared-int-views.js
@@ -13,9 +13,7 @@ var ab = new ArrayBuffer(16);
 var views = intArrayConstructors.slice();
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.add(new TA(ab), 0, 0),
-    'Atomics.add(new TA(ab), 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.add(new TA(ab), 0, 0);
+  }, 'Atomics.add(new TA(ab), 0, 0) throws TypeError');
 }, views);
diff --git a/test/built-ins/Atomics/add/shared-nonint-views.js b/test/built-ins/Atomics/add/shared-nonint-views.js
index 82fdfe8449af0cb87729769be2002904385de38d..505ea511c37c1368917e53dd20b0923d4656e379 100644
--- a/test/built-ins/Atomics/add/shared-nonint-views.js
+++ b/test/built-ins/Atomics/add/shared-nonint-views.js
@@ -12,9 +12,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 var buffer = new SharedArrayBuffer(1024);
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.add(new TA(buffer), 0, 0),
-    'Atomics.add(new TA(buffer), 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.add(new TA(buffer), 0, 0);
+  }, 'Atomics.add(new TA(buffer), 0, 0) throws TypeError');
 }, floatArrayConstructors);
diff --git a/test/built-ins/Atomics/and/bad-range.js b/test/built-ins/Atomics/and/bad-range.js
index e01b6def7fae4559469d7cda6323014e95eb07d1..f81a25df227eeb5d358f900c06e417054266614a 100644
--- a/test/built-ins/Atomics/and/bad-range.js
+++ b/test/built-ins/Atomics/and/bad-range.js
@@ -15,10 +15,8 @@ var views = intArrayConstructors.slice();
 testWithTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(
-      RangeError,
-      () => Atomics.and(view, IdxGen(view), 10),
-      'Atomics.and(view, IdxGen(view), 10) throws RangeError'
-    );
+    assert.throws(RangeError, function() {
+      Atomics.and(view, IdxGen(view), 10);
+    }, 'Atomics.and(view, IdxGen(view), 10) throws RangeError');
   });
 }, views);
diff --git a/test/built-ins/Atomics/and/bigint/bad-range.js b/test/built-ins/Atomics/and/bigint/bad-range.js
index 8e320065bc425b18030e0d9ca412272c77c9c1c8..5f72a1945b9db056ee7c445d3a548aa1520ffca8 100644
--- a/test/built-ins/Atomics/and/bigint/bad-range.js
+++ b/test/built-ins/Atomics/and/bigint/bad-range.js
@@ -14,10 +14,8 @@ var buffer = new SharedArrayBuffer(8);
 testWithBigIntTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(
-      RangeError,
-      () => Atomics.and(view, IdxGen(view), 10),
-      'Atomics.and(view, IdxGen(view), 10) throws RangeError'
-    );
+    assert.throws(RangeError, function() {
+      Atomics.and(view, IdxGen(view), 10);
+    }, 'Atomics.and(view, IdxGen(view), 10) throws RangeError');
   });
 });
diff --git a/test/built-ins/Atomics/and/bigint/nonshared-int-views.js b/test/built-ins/Atomics/and/bigint/nonshared-int-views.js
index 5005574664a3bc1c05645051a25e77e451aad24b..17b270dc23baa6c2d4a13e7b505a7d5fbc98379e 100644
--- a/test/built-ins/Atomics/and/bigint/nonshared-int-views.js
+++ b/test/built-ins/Atomics/and/bigint/nonshared-int-views.js
@@ -12,9 +12,7 @@ features: [ArrayBuffer, arrow-function, Atomics, BigInt, TypedArray]
 var buffer = new ArrayBuffer(16);
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.and(new TA(buffer), 0, 0),
-    'Atomics.and(new TA(buffer), 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.and(new TA(buffer), 0, 0);
+  }, 'Atomics.and(new TA(buffer), 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/and/non-views.js b/test/built-ins/Atomics/and/non-views.js
index 83cdd79add275756ab8dd14cd85ad0b265748e38..45544aee28b0a58e4d39eabbac60c5dc1cb06aa7 100644
--- a/test/built-ins/Atomics/and/non-views.js
+++ b/test/built-ins/Atomics/and/non-views.js
@@ -10,9 +10,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 testWithAtomicsNonViewValues(function(view) {
-  assert.throws(
-    TypeError,
-    () => Atomics.and(view, 0, 0),
-    'Atomics.and(view, 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.and(view, 0, 0);
+  }, 'Atomics.and(view, 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/and/nonshared-int-views.js b/test/built-ins/Atomics/and/nonshared-int-views.js
index f588fb7bb7074aefe4789e50ba784fc37647de31..b578f411ac9db06f5ef687a9624148d609209699 100644
--- a/test/built-ins/Atomics/and/nonshared-int-views.js
+++ b/test/built-ins/Atomics/and/nonshared-int-views.js
@@ -13,9 +13,7 @@ var buffer = new ArrayBuffer(16);
 var views = intArrayConstructors.slice();
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.and(new TA(buffer), 0, 0),
-    'Atomics.and(new TA(buffer), 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.and(new TA(buffer), 0, 0);
+  }, 'Atomics.and(new TA(buffer), 0, 0) throws TypeError');
 }, views);
diff --git a/test/built-ins/Atomics/and/shared-nonint-views.js b/test/built-ins/Atomics/and/shared-nonint-views.js
index 05d57616cf212ee1fe63c38736f33e40dcda7621..3dbd81b3b87399516ba468a92b71dd78348e9209 100644
--- a/test/built-ins/Atomics/and/shared-nonint-views.js
+++ b/test/built-ins/Atomics/and/shared-nonint-views.js
@@ -12,9 +12,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 var buffer = new SharedArrayBuffer(1024);
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.and(new TA(buffer), 0, 0),
-    'Atomics.and(new TA(buffer), 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.and(new TA(buffer), 0, 0);
+  }, 'Atomics.and(new TA(buffer), 0, 0) throws TypeError');
 }, floatArrayConstructors);
diff --git a/test/built-ins/Atomics/compareExchange/bad-range.js b/test/built-ins/Atomics/compareExchange/bad-range.js
index d43a2d66ac49fc8dd094de775902d35a6dd13331..8bac9a2f0ba160c1736d58c721b2e4ae0467f5b8 100644
--- a/test/built-ins/Atomics/compareExchange/bad-range.js
+++ b/test/built-ins/Atomics/compareExchange/bad-range.js
@@ -15,10 +15,8 @@ var views = intArrayConstructors.slice();
 testWithTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(
-      RangeError,
-      () => Atomics.compareExchange(view, IdxGen(view), 10, 0),
-      'Atomics.compareExchange(view, IdxGen(view), 10, 0) throws RangeError'
-    );
+    assert.throws(RangeError, function() {
+      Atomics.compareExchange(view, IdxGen(view), 10, 0);
+    }, 'Atomics.compareExchange(view, IdxGen(view), 10, 0) throws RangeError');
   });
 }, views);
diff --git a/test/built-ins/Atomics/compareExchange/bigint/bad-range.js b/test/built-ins/Atomics/compareExchange/bigint/bad-range.js
index 1b302f16761a0b3ae506407b8740159555ada13f..fa314956cb0643a0552857601ab9f3113b0edd2c 100644
--- a/test/built-ins/Atomics/compareExchange/bigint/bad-range.js
+++ b/test/built-ins/Atomics/compareExchange/bigint/bad-range.js
@@ -14,10 +14,8 @@ var buffer = new SharedArrayBuffer(8);
 testWithBigIntTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(
-      RangeError,
-      () => Atomics.compareExchange(view, IdxGen(view), 10, 0),
-      'Atomics.compareExchange(view, IdxGen(view), 10, 0) throws RangeError'
-    );
+    assert.throws(RangeError, function() {
+      Atomics.compareExchange(view, IdxGen(view), 10, 0);
+    }, 'Atomics.compareExchange(view, IdxGen(view), 10, 0) throws RangeError');
   });
 });
diff --git a/test/built-ins/Atomics/compareExchange/bigint/nonshared-int-views.js b/test/built-ins/Atomics/compareExchange/bigint/nonshared-int-views.js
index 083fb0bf6bb50e30ca7680ab4aced1888b89f686..5efe40c8e62b7af0165317a8d33a576e7d101a6a 100644
--- a/test/built-ins/Atomics/compareExchange/bigint/nonshared-int-views.js
+++ b/test/built-ins/Atomics/compareExchange/bigint/nonshared-int-views.js
@@ -12,9 +12,7 @@ features: [ArrayBuffer, arrow-function, Atomics, BigInt, TypedArray]
 var buffer = new ArrayBuffer(16);
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.compareExchange(new TA(buffer), 0, 0, 0),
-    'Atomics.compareExchange(new TA(buffer), 0, 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.compareExchange(new TA(buffer), 0, 0, 0);
+  }, 'Atomics.compareExchange(new TA(buffer), 0, 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/compareExchange/non-views.js b/test/built-ins/Atomics/compareExchange/non-views.js
index 2f073adf0686c404f6d791d98ded4aa1a42adbd6..2f49a21c90be3fedf771b51207ce0a9084125a11 100644
--- a/test/built-ins/Atomics/compareExchange/non-views.js
+++ b/test/built-ins/Atomics/compareExchange/non-views.js
@@ -10,9 +10,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 testWithAtomicsNonViewValues(function(view) {
-  assert.throws(
-    TypeError,
-    () => Atomics.compareExchange(view, 0, 0, 0),
-    'Atomics.compareExchange(view, 0, 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.compareExchange(view, 0, 0, 0);
+  }, 'Atomics.compareExchange(view, 0, 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/compareExchange/nonshared-int-views.js b/test/built-ins/Atomics/compareExchange/nonshared-int-views.js
index e021e0030142ea85c8a308871c3af8415fa301c1..d1477aa0bec35ef64385ad74ee77c69cca0779ab 100644
--- a/test/built-ins/Atomics/compareExchange/nonshared-int-views.js
+++ b/test/built-ins/Atomics/compareExchange/nonshared-int-views.js
@@ -13,9 +13,7 @@ var buffer = new ArrayBuffer(16);
 var views = intArrayConstructors.slice();
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.compareExchange(new TA(buffer), 0, 0, 0),
-    'Atomics.compareExchange(new TA(buffer), 0, 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.compareExchange(new TA(buffer), 0, 0, 0);
+  }, 'Atomics.compareExchange(new TA(buffer), 0, 0, 0) throws TypeError');
 }, views);
diff --git a/test/built-ins/Atomics/compareExchange/shared-nonint-views.js b/test/built-ins/Atomics/compareExchange/shared-nonint-views.js
index 6fac3bf5a6e2501fcae68099d216046fd6ab665c..3160bc441984e80470343add0b2387891b90c056 100644
--- a/test/built-ins/Atomics/compareExchange/shared-nonint-views.js
+++ b/test/built-ins/Atomics/compareExchange/shared-nonint-views.js
@@ -12,9 +12,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 var buffer = new SharedArrayBuffer(1024);
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.compareExchange(new TA(buffer), 0, 0, 0),
-    'Atomics.compareExchange(new TA(buffer), 0, 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.compareExchange(new TA(buffer), 0, 0, 0);
+  }, 'Atomics.compareExchange(new TA(buffer), 0, 0, 0) throws TypeError');
 }, floatArrayConstructors);
diff --git a/test/built-ins/Atomics/exchange/bad-range.js b/test/built-ins/Atomics/exchange/bad-range.js
index 5073f7ab73b60293c31b5de98e5e0fcaae6e7b0c..2723e699e82e0ed5774f855e8c9cd17de2258de0 100644
--- a/test/built-ins/Atomics/exchange/bad-range.js
+++ b/test/built-ins/Atomics/exchange/bad-range.js
@@ -15,10 +15,8 @@ var views = intArrayConstructors.slice();
 testWithTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(
-      RangeError,
-      () => Atomics.exchange(view, IdxGen(view), 10, 0),
-      'Atomics.exchange(view, IdxGen(view), 10, 0) throws RangeError'
-    );
+    assert.throws(RangeError, function() {
+      Atomics.exchange(view, IdxGen(view), 10, 0);
+    }, 'Atomics.exchange(view, IdxGen(view), 10, 0) throws RangeError');
   });
 }, views);
diff --git a/test/built-ins/Atomics/exchange/bigint/bad-range.js b/test/built-ins/Atomics/exchange/bigint/bad-range.js
index dd0599c033de0b7279d27bbb97bc2a107c08b989..cab5f3bd59225bd4a76002a0f9de2c75234fcd3b 100644
--- a/test/built-ins/Atomics/exchange/bigint/bad-range.js
+++ b/test/built-ins/Atomics/exchange/bigint/bad-range.js
@@ -14,10 +14,8 @@ var buffer = new SharedArrayBuffer(8);
 testWithBigIntTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(
-      RangeError,
-      () => Atomics.exchange(view, IdxGen(view), 10, 0),
-      'Atomics.exchange(view, IdxGen(view), 10, 0) throws RangeError'
-    );
+    assert.throws(RangeError, function() {
+      Atomics.exchange(view, IdxGen(view), 10, 0);
+    }, 'Atomics.exchange(view, IdxGen(view), 10, 0) throws RangeError');
   });
 });
diff --git a/test/built-ins/Atomics/exchange/bigint/nonshared-int-views.js b/test/built-ins/Atomics/exchange/bigint/nonshared-int-views.js
index 5f70fa85c842281847bf22a9e22a10d64da56063..8a2d2a82593b1b0a1c2f3c4da620df36531a4149 100644
--- a/test/built-ins/Atomics/exchange/bigint/nonshared-int-views.js
+++ b/test/built-ins/Atomics/exchange/bigint/nonshared-int-views.js
@@ -12,9 +12,7 @@ features: [ArrayBuffer, arrow-function, Atomics, BigInt, TypedArray]
 var buffer = new ArrayBuffer(16);
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.exchange(new TA(buffer), 0, 0),
-    'Atomics.exchange(new TA(buffer), 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.exchange(new TA(buffer), 0, 0);
+  }, 'Atomics.exchange(new TA(buffer), 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/exchange/non-views.js b/test/built-ins/Atomics/exchange/non-views.js
index cedc44610332fe2fce0297b0db7b782ff0ca1337..02a899ec4fcf86b3355be00bbfbf53007d5e0028 100644
--- a/test/built-ins/Atomics/exchange/non-views.js
+++ b/test/built-ins/Atomics/exchange/non-views.js
@@ -10,9 +10,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 testWithAtomicsNonViewValues(function(view) {
-  assert.throws(
-    TypeError,
-    () => Atomics.exchange(view, 0, 0),
-    'Atomics.exchange(view, 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.exchange(view, 0, 0);
+  }, 'Atomics.exchange(view, 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/exchange/nonshared-int-views.js b/test/built-ins/Atomics/exchange/nonshared-int-views.js
index 937d5cff5c29b5bd6d0233eae018f786358ab796..8de5815f5f6af74bd77bc299b3dbf9f5a96ab3fd 100644
--- a/test/built-ins/Atomics/exchange/nonshared-int-views.js
+++ b/test/built-ins/Atomics/exchange/nonshared-int-views.js
@@ -13,9 +13,7 @@ var buffer = new ArrayBuffer(16);
 var views = intArrayConstructors.slice();
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.exchange(new TA(buffer), 0, 0),
-    'Atomics.exchange(new TA(buffer), 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.exchange(new TA(buffer), 0, 0);
+  }, 'Atomics.exchange(new TA(buffer), 0, 0) throws TypeError');
 }, views);
diff --git a/test/built-ins/Atomics/exchange/shared-nonint-views.js b/test/built-ins/Atomics/exchange/shared-nonint-views.js
index b5e2edb24c2766302cb0d4a6418a34b1096cb1c5..c3e4ad4d0a4897103775052e772614e60d94b50c 100644
--- a/test/built-ins/Atomics/exchange/shared-nonint-views.js
+++ b/test/built-ins/Atomics/exchange/shared-nonint-views.js
@@ -12,9 +12,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 var buffer = new SharedArrayBuffer(1024);
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(
-    TypeError,
-    () => Atomics.exchange(new TA(buffer), 0, 0),
-    'Atomics.exchange(new TA(buffer), 0, 0) throws TypeError'
-  );
+  assert.throws(TypeError, function() {
+    Atomics.exchange(new TA(buffer), 0, 0);
+  }, 'Atomics.exchange(new TA(buffer), 0, 0) throws TypeError');
 }, floatArrayConstructors);
diff --git a/test/built-ins/Atomics/load/bad-range.js b/test/built-ins/Atomics/load/bad-range.js
index 32373693fad22aafb9d22b5b7f5a5418c9beb1e9..5f6a901f0fc437470f69d6dffedef1ffd26aee50 100644
--- a/test/built-ins/Atomics/load/bad-range.js
+++ b/test/built-ins/Atomics/load/bad-range.js
@@ -15,6 +15,8 @@ var views = intArrayConstructors.slice();
 testWithTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(RangeError, () => Atomics.load(view, IdxGen(view)));
+    assert.throws(RangeError, function() {
+      Atomics.load(view, IdxGen(view));
+    }, 'Atomics.load(view, IdxGen(view)) throws RangeError');
   });
 }, views);
diff --git a/test/built-ins/Atomics/load/bigint/bad-range.js b/test/built-ins/Atomics/load/bigint/bad-range.js
index b69a416042223cf837b28380425921579cdf2b77..6ec13f2a5b8e749496284fc8b40fee4391849f84 100644
--- a/test/built-ins/Atomics/load/bigint/bad-range.js
+++ b/test/built-ins/Atomics/load/bigint/bad-range.js
@@ -14,6 +14,8 @@ var buffer = new SharedArrayBuffer(8);
 testWithBigIntTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(RangeError, () => Atomics.load(view, IdxGen(view)));
+    assert.throws(RangeError, function() {
+      Atomics.load(view, IdxGen(view));
+    }, 'Atomics.load(view, IdxGen(view)) throws RangeError');
   });
 });
diff --git a/test/built-ins/Atomics/load/bigint/nonshared-int-views.js b/test/built-ins/Atomics/load/bigint/nonshared-int-views.js
index ae9c5f27cefdce953a3dadde085a732827fcd7b5..8dc6195901f6f071ddae901396dde08be6272794 100644
--- a/test/built-ins/Atomics/load/bigint/nonshared-int-views.js
+++ b/test/built-ins/Atomics/load/bigint/nonshared-int-views.js
@@ -15,5 +15,7 @@ var ab = new ArrayBuffer(16);
 testWithBigIntTypedArrayConstructors(function(TA) {
   var view = new TA(ab);
 
-  assert.throws(TypeError, (() => Atomics.load(view, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.load(view, 0);
+  }, 'Atomics.load(view, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/load/non-views.js b/test/built-ins/Atomics/load/non-views.js
index 11187136fe5d8cf9db89015a8dfffa09222041c7..2dab45f5da869680f848523668bd6940d65a6e6b 100644
--- a/test/built-ins/Atomics/load/non-views.js
+++ b/test/built-ins/Atomics/load/non-views.js
@@ -10,5 +10,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 testWithAtomicsNonViewValues(function(view) {
-  assert.throws(TypeError, (() => Atomics.load(view, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.load(view, 0);
+  }, 'Atomics.load(view, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/load/nonshared-int-views.js b/test/built-ins/Atomics/load/nonshared-int-views.js
index 54519f2101242febd911d6ce8d6f37d23c440dcb..6c33c020914dc8813d576f23c2da76d78051863c 100644
--- a/test/built-ins/Atomics/load/nonshared-int-views.js
+++ b/test/built-ins/Atomics/load/nonshared-int-views.js
@@ -16,5 +16,7 @@ var views = intArrayConstructors.slice();
 testWithTypedArrayConstructors(function(TA) {
   var view = new TA(ab);
 
-  assert.throws(TypeError, (() => Atomics.load(view, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.load(view, 0);
+  }, 'Atomics.load(view, 0) throws TypeError');
 }, views);
diff --git a/test/built-ins/Atomics/load/shared-nonint-views.js b/test/built-ins/Atomics/load/shared-nonint-views.js
index f50b2746422976d5eb715163e8a68b98cee93292..3e1f875a9d6533fa0a09ce54097be81820e21520 100644
--- a/test/built-ins/Atomics/load/shared-nonint-views.js
+++ b/test/built-ins/Atomics/load/shared-nonint-views.js
@@ -11,5 +11,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 
 var buffer = new SharedArrayBuffer(1024);
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.load(new TA(buffer), 0)));
+  assert.throws(TypeError, function() {
+    Atomics.load(new TA(buffer), 0);
+  }, 'Atomics.load(new TA(buffer), 0) throws TypeError');
 }, floatArrayConstructors);
diff --git a/test/built-ins/Atomics/or/bad-range.js b/test/built-ins/Atomics/or/bad-range.js
index e1b9f68b3c4018b1a57c0206fee30e620f4f1cdd..f9e5c3b872ba69cb67f83e6fb38ca876d09e7f3e 100644
--- a/test/built-ins/Atomics/or/bad-range.js
+++ b/test/built-ins/Atomics/or/bad-range.js
@@ -15,6 +15,8 @@ var views = intArrayConstructors.slice();
 testWithTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(RangeError, () => Atomics.or(view, IdxGen(view), 10));
+    assert.throws(RangeError, function() {
+      Atomics.or(view, IdxGen(view), 10);
+    }, 'Atomics.or(view, IdxGen(view), 10) throws RangeError');
   });
 }, views);
diff --git a/test/built-ins/Atomics/or/bigint/bad-range.js b/test/built-ins/Atomics/or/bigint/bad-range.js
index 26424458467139dc31e2c5fdabf3c1d4d1720d34..9c5693233d483f63ffd9129ab2afdf4d9d3ab116 100644
--- a/test/built-ins/Atomics/or/bigint/bad-range.js
+++ b/test/built-ins/Atomics/or/bigint/bad-range.js
@@ -14,6 +14,8 @@ var buffer = new SharedArrayBuffer(8);
 testWithBigIntTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(RangeError, () => Atomics.or(view, IdxGen(view), 10));
+    assert.throws(RangeError, function() {
+      Atomics.or(view, IdxGen(view), 10);
+    }, 'Atomics.or(view, IdxGen(view), 10) throws RangeError');
   });
 });
diff --git a/test/built-ins/Atomics/or/bigint/nonshared-int-views.js b/test/built-ins/Atomics/or/bigint/nonshared-int-views.js
index 9fbb6fce613f4a55591f19ce4dd0f407f6d58d44..ae8b56117fb5834bc12cb5f15f4b3a7c0330d68e 100644
--- a/test/built-ins/Atomics/or/bigint/nonshared-int-views.js
+++ b/test/built-ins/Atomics/or/bigint/nonshared-int-views.js
@@ -12,5 +12,7 @@ features: [ArrayBuffer, arrow-function, Atomics, BigInt, TypedArray]
 var buffer = new ArrayBuffer(16);
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.or(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.or(new TA(buffer), 0, 0);
+  }, 'Atomics.or(new TA(buffer), 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/or/non-views.js b/test/built-ins/Atomics/or/non-views.js
index feb25c906eae5aff4633054d798e11eca0ab9058..04f82bacfc0cfa0380ded67ddc5dd28212ba9466 100644
--- a/test/built-ins/Atomics/or/non-views.js
+++ b/test/built-ins/Atomics/or/non-views.js
@@ -10,5 +10,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 testWithAtomicsNonViewValues(function(view) {
-  assert.throws(TypeError, (() => Atomics.or(view, 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.or(view, 0, 0);
+  }, 'Atomics.or(view, 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/or/nonshared-int-views.js b/test/built-ins/Atomics/or/nonshared-int-views.js
index 09517d4c84cefb5f43e862c7f326e09dc8adda8d..5c92bd5665e19672d1c5cf0e90700d6672e742c6 100644
--- a/test/built-ins/Atomics/or/nonshared-int-views.js
+++ b/test/built-ins/Atomics/or/nonshared-int-views.js
@@ -13,5 +13,7 @@ var buffer = new ArrayBuffer(16);
 var views = intArrayConstructors.slice();
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.or(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.or(new TA(buffer), 0, 0);
+  }, 'Atomics.or(new TA(buffer), 0, 0) throws TypeError');
 }, views);
diff --git a/test/built-ins/Atomics/or/shared-nonint-views.js b/test/built-ins/Atomics/or/shared-nonint-views.js
index 5217318e8d2856578c8062446a44236d72495a65..2dd48cbc3c59a6c5881c0ba53ddb49641f7f7fc2 100644
--- a/test/built-ins/Atomics/or/shared-nonint-views.js
+++ b/test/built-ins/Atomics/or/shared-nonint-views.js
@@ -12,7 +12,9 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 var buffer = new SharedArrayBuffer(1024);
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.or(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.or(new TA(buffer), 0, 0);
+  }, 'Atomics.or(new TA(buffer), 0, 0) throws TypeError');
 }, floatArrayConstructors);
 
 
diff --git a/test/built-ins/Atomics/store/bad-range.js b/test/built-ins/Atomics/store/bad-range.js
index d5c31508f069a54fd6d5c910806278624626a4aa..7511001408f4d364b4e5be9a06b2553d160cc481 100644
--- a/test/built-ins/Atomics/store/bad-range.js
+++ b/test/built-ins/Atomics/store/bad-range.js
@@ -15,6 +15,8 @@ var views = intArrayConstructors.slice();
 testWithTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(RangeError, () => Atomics.store(view, IdxGen(view), 10));
+    assert.throws(RangeError, function() {
+      Atomics.store(view, IdxGen(view), 10);
+    }, 'Atomics.store(view, IdxGen(view), 10) throws RangeError');
   });
 }, views);
diff --git a/test/built-ins/Atomics/store/bigint/bad-range.js b/test/built-ins/Atomics/store/bigint/bad-range.js
index dfcb100ee16c4f9ab12131d683737e8698a7791e..7f7551ec5059b724cd3a59ad0b8111823e6bd7f4 100644
--- a/test/built-ins/Atomics/store/bigint/bad-range.js
+++ b/test/built-ins/Atomics/store/bigint/bad-range.js
@@ -14,6 +14,8 @@ var buffer = new SharedArrayBuffer(8);
 testWithBigIntTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(RangeError, () => Atomics.store(view, IdxGen(view), 10));
+    assert.throws(RangeError, function() {
+      Atomics.store(view, IdxGen(view), 10);
+    }, 'Atomics.store(view, IdxGen(view), 10) throws RangeError');
   });
 });
diff --git a/test/built-ins/Atomics/store/bigint/nonshared-int-views.js b/test/built-ins/Atomics/store/bigint/nonshared-int-views.js
index e9abab09ce8f0b4879f52544ea9829563b8cf4ac..ab5942d81ba86869764393635787d974cc7bd738 100644
--- a/test/built-ins/Atomics/store/bigint/nonshared-int-views.js
+++ b/test/built-ins/Atomics/store/bigint/nonshared-int-views.js
@@ -12,5 +12,7 @@ features: [ArrayBuffer, arrow-function, Atomics, BigInt, TypedArray]
 var buffer = new ArrayBuffer(16);
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.store(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.store(new TA(buffer), 0, 0);
+  }, 'Atomics.store(new TA(buffer), 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/store/non-views.js b/test/built-ins/Atomics/store/non-views.js
index e34616f9930a34b81df9136d1cb028b45b1d5c0e..bc256a3a27b01817bba74454f9241c0d91f770e3 100644
--- a/test/built-ins/Atomics/store/non-views.js
+++ b/test/built-ins/Atomics/store/non-views.js
@@ -10,5 +10,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 testWithAtomicsNonViewValues(function(view) {
-  assert.throws(TypeError, (() => Atomics.store(view, 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.store(view, 0, 0);
+  }, 'Atomics.store(view, 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/store/nonshared-int-views.js b/test/built-ins/Atomics/store/nonshared-int-views.js
index b6aec38496b58fa2215f23cfef13370e9d8848ca..90591d4489a104adb5a435bf1787f77bab37c346 100644
--- a/test/built-ins/Atomics/store/nonshared-int-views.js
+++ b/test/built-ins/Atomics/store/nonshared-int-views.js
@@ -13,5 +13,7 @@ var buffer = new ArrayBuffer(16);
 var views = intArrayConstructors.slice();
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.store(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.store(new TA(buffer), 0, 0);
+  }, 'Atomics.store(new TA(buffer), 0, 0) throws TypeError');
 }, views);
diff --git a/test/built-ins/Atomics/store/shared-nonint-views.js b/test/built-ins/Atomics/store/shared-nonint-views.js
index 4e363d409a708b5f8b0db875e7cd675962aea18b..fd3d159e8980e1f28e702ccb68254ff515ba6494 100644
--- a/test/built-ins/Atomics/store/shared-nonint-views.js
+++ b/test/built-ins/Atomics/store/shared-nonint-views.js
@@ -12,7 +12,9 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 var buffer = new SharedArrayBuffer(1024);
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.store(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.store(new TA(buffer), 0, 0);
+  }, 'Atomics.store(new TA(buffer), 0, 0) throws TypeError');
 }, floatArrayConstructors);
 
 
diff --git a/test/built-ins/Atomics/sub/bad-range.js b/test/built-ins/Atomics/sub/bad-range.js
index 35e152e6812352d21ae1bf5531959e0a331dd831..dfbcb672d7b0d5cde85c2a945d2807798f991d0a 100644
--- a/test/built-ins/Atomics/sub/bad-range.js
+++ b/test/built-ins/Atomics/sub/bad-range.js
@@ -15,6 +15,8 @@ var views = intArrayConstructors.slice();
 testWithTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(RangeError, () => Atomics.sub(view, IdxGen(view), 10));
+    assert.throws(RangeError, function() {
+      Atomics.sub(view, IdxGen(view), 10);
+    }, 'Atomics.sub(view, IdxGen(view), 10) throws RangeError');
   });
 }, views);
diff --git a/test/built-ins/Atomics/sub/bigint/bad-range.js b/test/built-ins/Atomics/sub/bigint/bad-range.js
index 4454cefeb1aac48e8e144d767de4b053c592b975..040f4f4e73085289cca6490a89e46b89f9d5723e 100644
--- a/test/built-ins/Atomics/sub/bigint/bad-range.js
+++ b/test/built-ins/Atomics/sub/bigint/bad-range.js
@@ -14,6 +14,8 @@ var buffer = new SharedArrayBuffer(8);
 testWithBigIntTypedArrayConstructors(function(TA) {
   let view = new TA(buffer);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(RangeError, () => Atomics.sub(view, IdxGen(view), 10));
+    assert.throws(RangeError, function() {
+      Atomics.sub(view, IdxGen(view), 10);
+    }, 'Atomics.sub(view, IdxGen(view), 10) throws RangeError');
   });
 });
diff --git a/test/built-ins/Atomics/sub/bigint/nonshared-int-views.js b/test/built-ins/Atomics/sub/bigint/nonshared-int-views.js
index c570a47902b5135f8d4382d0c7e07639dcdf1caf..de1455b3010794e3f129fd0b80f8b5c8ef7d89df 100644
--- a/test/built-ins/Atomics/sub/bigint/nonshared-int-views.js
+++ b/test/built-ins/Atomics/sub/bigint/nonshared-int-views.js
@@ -12,5 +12,7 @@ features: [ArrayBuffer, arrow-function, Atomics, BigInt, TypedArray]
 var buffer = new ArrayBuffer(16);
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.sub(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.sub(new TA(buffer), 0, 0);
+  }, 'Atomics.sub(new TA(buffer), 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/sub/non-views.js b/test/built-ins/Atomics/sub/non-views.js
index d4b12d5b2d8796206871bb283e524f5a83cb1b08..46233994e67d1a1af92469d6fe9b9f0274f9c10c 100644
--- a/test/built-ins/Atomics/sub/non-views.js
+++ b/test/built-ins/Atomics/sub/non-views.js
@@ -10,5 +10,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 testWithAtomicsNonViewValues(function(view) {
-  assert.throws(TypeError, (() => Atomics.sub(view, 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.sub(view, 0, 0);
+  }, 'Atomics.sub(view, 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/sub/nonshared-int-views.js b/test/built-ins/Atomics/sub/nonshared-int-views.js
index a254a2048987c83a758635e714fd7a1b80dbff2a..ff7bbf0925429675b4b0f41031399613d07bfe84 100644
--- a/test/built-ins/Atomics/sub/nonshared-int-views.js
+++ b/test/built-ins/Atomics/sub/nonshared-int-views.js
@@ -13,5 +13,7 @@ var buffer = new ArrayBuffer(16);
 var views = intArrayConstructors.slice();
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.sub(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.sub(new TA(buffer), 0, 0);
+  }, 'Atomics.sub(new TA(buffer), 0, 0) throws TypeError');
 }, views);
diff --git a/test/built-ins/Atomics/sub/shared-nonint-views.js b/test/built-ins/Atomics/sub/shared-nonint-views.js
index 89159d5879217827b90756ac1a5dcc574245773c..9c373891cfe24fc8488c0956116919bc43332b13 100644
--- a/test/built-ins/Atomics/sub/shared-nonint-views.js
+++ b/test/built-ins/Atomics/sub/shared-nonint-views.js
@@ -12,7 +12,9 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 var buffer = new SharedArrayBuffer(1024);
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.sub(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.sub(new TA(buffer), 0, 0);
+  }, 'Atomics.sub(new TA(buffer), 0, 0) throws TypeError');
 }, floatArrayConstructors);
 
 
diff --git a/test/built-ins/Atomics/wait/bad-range.js b/test/built-ins/Atomics/wait/bad-range.js
index eb051f381bd7de6718bc257bccd4aeac334d4700..b435060181c71f7f7a14a517ec73552fb11dfaf0 100644
--- a/test/built-ins/Atomics/wait/bad-range.js
+++ b/test/built-ins/Atomics/wait/bad-range.js
@@ -19,5 +19,7 @@ var sab = new SharedArrayBuffer(8);
 let i32a = new Int32Array(sab);
 
 testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-  assert.throws(RangeError, () => Atomics.wait(i32a, IdxGen(i32a), 0, 0));
+  assert.throws(RangeError, function() {
+    Atomics.wait(i32a, IdxGen(i32a), 0, 0);
+  }, 'Atomics.wait(i32a, IdxGen(i32a), 0, 0) throws RangeError');
 });
diff --git a/test/built-ins/Atomics/wait/bigint/bad-range.js b/test/built-ins/Atomics/wait/bigint/bad-range.js
index eda06ac002ccaa0e90058ef4eb32df519bf262ad..f40d76f01a7794bf1e95e2f6f3ae104774f73808 100644
--- a/test/built-ins/Atomics/wait/bigint/bad-range.js
+++ b/test/built-ins/Atomics/wait/bigint/bad-range.js
@@ -19,5 +19,7 @@ var sab = new SharedArrayBuffer(8);
 let i64a = new BigInt64Array(sab);
 
 testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-  assert.throws(RangeError, () => Atomics.wait(i64a, IdxGen(i64a), 0, 0));
+  assert.throws(RangeError, function() {
+    Atomics.wait(i64a, IdxGen(i64a), 0, 0);
+  }, 'Atomics.wait(i64a, IdxGen(i64a), 0, 0) throws RangeError');
 });
diff --git a/test/built-ins/Atomics/wake/bad-range.js b/test/built-ins/Atomics/wake/bad-range.js
index 0c4824d5bfe3c971e0b80b483702bad62728c291..ab3ab03bb35f86f90087309ce905f3b34e63f28c 100644
--- a/test/built-ins/Atomics/wake/bad-range.js
+++ b/test/built-ins/Atomics/wake/bad-range.js
@@ -21,6 +21,8 @@ var views = [Int32Array];
 testWithTypedArrayConstructors(function(TA) {
   let view = new TA(sab);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(RangeError, () => Atomics.wake(view, IdxGen(view), 0)); // Even with waking zero
+    assert.throws(RangeError, function() {
+      Atomics.wake(view, IdxGen(view), 0);
+    }, 'Atomics.wake(view, IdxGen(view), 0) throws RangeError'); // Even with waking zero
   });
 }, views);
diff --git a/test/built-ins/Atomics/wake/bigint/bad-range.js b/test/built-ins/Atomics/wake/bigint/bad-range.js
index 70d35c17a31e61818ed6b0c2a9acce5d305deb9c..78a378668046fe477ec2087501800b7769911dbe 100644
--- a/test/built-ins/Atomics/wake/bigint/bad-range.js
+++ b/test/built-ins/Atomics/wake/bigint/bad-range.js
@@ -19,5 +19,7 @@ var sab = new SharedArrayBuffer(8);
 let i64a = new BigInt64Array(sab);
 
 testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-  assert.throws(RangeError, () => Atomics.wake(view, IdxGen(i64a), 0));
+  assert.throws(RangeError, function() {
+    Atomics.wake(view, IdxGen(i64a), 0);
+  }, 'Atomics.wake(view, IdxGen(i64a), 0) throws RangeError');
 });
diff --git a/test/built-ins/Atomics/wake/negative-index-throws.js b/test/built-ins/Atomics/wake/negative-index-throws.js
index 442fd4820a763172bbe16a35a288606efa2c6e6e..c092f2207480ef74307644cc41d0a4072e2c42e8 100644
--- a/test/built-ins/Atomics/wake/negative-index-throws.js
+++ b/test/built-ins/Atomics/wake/negative-index-throws.js
@@ -24,7 +24,15 @@ var poisoned = {
   }
 };
 
-assert.throws(RangeError, () => Atomics.wake(i32a, -Infinity, poisoned));
-assert.throws(RangeError, () => Atomics.wake(i32a, -7.999, poisoned));
-assert.throws(RangeError, () => Atomics.wake(i32a, -1, poisoned));
-assert.throws(RangeError, () => Atomics.wake(i32a, -300, poisoned));
+assert.throws(RangeError, function() {
+  Atomics.wake(i32a, -Infinity, poisoned);
+}, 'Atomics.wake(i32a, -Infinity, poisoned) throws RangeError');
+assert.throws(RangeError, function() {
+  Atomics.wake(i32a, -7.999, poisoned);
+}, 'Atomics.wake(i32a, -7.999, poisoned) throws RangeError');
+assert.throws(RangeError, function() {
+  Atomics.wake(i32a, -1, poisoned);
+}, 'Atomics.wake(i32a, -1, poisoned) throws RangeError');
+assert.throws(RangeError, function() {
+  Atomics.wake(i32a, -300, poisoned);
+}, 'Atomics.wake(i32a, -300, poisoned) throws RangeError');
diff --git a/test/built-ins/Atomics/wake/non-views.js b/test/built-ins/Atomics/wake/non-views.js
index aaffd003094eac80ca2850ced1f8ea635b777cf7..711d69039230e1de504b9d2f670c7b3eca4afafc 100644
--- a/test/built-ins/Atomics/wake/non-views.js
+++ b/test/built-ins/Atomics/wake/non-views.js
@@ -10,5 +10,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 testWithAtomicsNonViewValues(function(view) {
-  assert.throws(TypeError, (() => Atomics.wake(view, 0, 0))); // Even with count == 0
+  assert.throws(TypeError, function() {
+    Atomics.wake(view, 0, 0);
+  }, 'Atomics.wake(view, 0, 0) throws TypeError'); // Even with count == 0
 });
diff --git a/test/built-ins/Atomics/wake/nonshared-int-views.js b/test/built-ins/Atomics/wake/nonshared-int-views.js
index 8659be35819d98435c3456c38cd55cabd29145ef..e8cfc624814d799bfb07b058b571ddbb9ac65146 100644
--- a/test/built-ins/Atomics/wake/nonshared-int-views.js
+++ b/test/built-ins/Atomics/wake/nonshared-int-views.js
@@ -14,5 +14,7 @@ var views = intArrayConstructors.slice();
 
 testWithTypedArrayConstructors(function(TA) {
   // Should fail even if waking zero waiters
-  assert.throws(TypeError, (() => Atomics.wake(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.wake(new TA(buffer), 0, 0);
+  }, 'Atomics.wake(new TA(buffer), 0, 0) throws TypeError');
 }, views);
diff --git a/test/built-ins/Atomics/wake/shared-nonint-views.js b/test/built-ins/Atomics/wake/shared-nonint-views.js
index 727e2e5eaa100cf7614ce77fc292145c2f3ea550..4259c3a7a15805e0926021205bc1b2c667d408b8 100644
--- a/test/built-ins/Atomics/wake/shared-nonint-views.js
+++ b/test/built-ins/Atomics/wake/shared-nonint-views.js
@@ -12,7 +12,9 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 var buffer = new SharedArrayBuffer(1024);
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.wake(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.wake(new TA(buffer), 0, 0);
+  }, 'Atomics.wake(new TA(buffer), 0, 0) throws TypeError');
 }, floatArrayConstructors);
 
 
diff --git a/test/built-ins/Atomics/xor/bad-range.js b/test/built-ins/Atomics/xor/bad-range.js
index 2dc1c48ee425a2453624b4ab41d94e0624d95666..6679bdbda35dccc8c4b8170f84b92946cba3a963 100644
--- a/test/built-ins/Atomics/xor/bad-range.js
+++ b/test/built-ins/Atomics/xor/bad-range.js
@@ -15,6 +15,8 @@ var views = intArrayConstructors.slice();
 testWithTypedArrayConstructors(function(TA) {
   let view = new TA(sab);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(RangeError, () => Atomics.xor(view, IdxGen(view), 0));
+    assert.throws(RangeError, function() {
+      Atomics.xor(view, IdxGen(view), 0);
+    }, 'Atomics.xor(view, IdxGen(view), 0) throws RangeError');
   });
 }, views);
diff --git a/test/built-ins/Atomics/xor/bigint/bad-range.js b/test/built-ins/Atomics/xor/bigint/bad-range.js
index 3837ea022f173a3080dab3d496bbf66c1b5ce55a..faff7b0bb6d543b72c25a83742f6bfe086a6e42a 100644
--- a/test/built-ins/Atomics/xor/bigint/bad-range.js
+++ b/test/built-ins/Atomics/xor/bigint/bad-range.js
@@ -14,6 +14,8 @@ var sab = new SharedArrayBuffer(8);
 testWithBigIntTypedArrayConstructors(function(TA) {
   let view = new TA(sab);
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
-    assert.throws(RangeError, () => Atomics.xor(view, IdxGen(view), 0));
+    assert.throws(RangeError, function() {
+      Atomics.xor(view, IdxGen(view), 0);
+    }, 'Atomics.xor(view, IdxGen(view), 0) throws RangeError');
   });
 });
diff --git a/test/built-ins/Atomics/xor/bigint/nonshared-int-views.js b/test/built-ins/Atomics/xor/bigint/nonshared-int-views.js
index 4bba3226fac43e95b00b091b530636f24576a76c..e90630be343c2abb33d9de051a0e30466cee6095 100644
--- a/test/built-ins/Atomics/xor/bigint/nonshared-int-views.js
+++ b/test/built-ins/Atomics/xor/bigint/nonshared-int-views.js
@@ -12,5 +12,7 @@ features: [ArrayBuffer, arrow-function, Atomics, BigInt, TypedArray]
 var buffer = new ArrayBuffer(16);
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.xor(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.xor(new TA(buffer), 0, 0);
+  }, 'Atomics.xor(new TA(buffer), 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/xor/non-views.js b/test/built-ins/Atomics/xor/non-views.js
index 1ff989839f498cbea367d9888940fab63b46c959..b328f700019707156c0d1b453049d89d85ea34de 100644
--- a/test/built-ins/Atomics/xor/non-views.js
+++ b/test/built-ins/Atomics/xor/non-views.js
@@ -10,5 +10,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 testWithAtomicsNonViewValues(function(view) {
-  assert.throws(TypeError, (() => Atomics.xor(view, 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.xor(view, 0, 0);
+  }, 'Atomics.xor(view, 0, 0) throws TypeError');
 });
diff --git a/test/built-ins/Atomics/xor/nonshared-int-views.js b/test/built-ins/Atomics/xor/nonshared-int-views.js
index 2ecdb02f5d752f987aacf71cc8b3666d0a7833a4..8be4b2d7bcee16784e811388d43d867813415f79 100644
--- a/test/built-ins/Atomics/xor/nonshared-int-views.js
+++ b/test/built-ins/Atomics/xor/nonshared-int-views.js
@@ -13,5 +13,7 @@ var buffer = new ArrayBuffer(16);
 var views = intArrayConstructors.slice();
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.xor(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.xor(new TA(buffer), 0, 0);
+  }, 'Atomics.xor(new TA(buffer), 0, 0) throws TypeError');
 }, views);
diff --git a/test/built-ins/Atomics/xor/shared-nonint-views.js b/test/built-ins/Atomics/xor/shared-nonint-views.js
index fca92c923abb24afff961f8fb5fa15e0bf1b0335..845d459a9407e3589c4b6d42643583c5d562c3fc 100644
--- a/test/built-ins/Atomics/xor/shared-nonint-views.js
+++ b/test/built-ins/Atomics/xor/shared-nonint-views.js
@@ -12,5 +12,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 var buffer = new SharedArrayBuffer(1024);
 
 testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, (() => Atomics.xor(new TA(buffer), 0, 0)));
+  assert.throws(TypeError, function() {
+    Atomics.xor(new TA(buffer), 0, 0);
+  }, 'Atomics.xor(new TA(buffer), 0, 0) throws TypeError');
 }, floatArrayConstructors);