diff --git a/test/built-ins/Atomics/add/bad-range.js b/test/built-ins/Atomics/add/bad-range.js
index a887c35481d392350b9924f7e55b7e30ec2ac56b..2139e57c23ff5da1277fb8ed6d22dd1651529f6d 100644
--- a/test/built-ins/Atomics/add/bad-range.js
+++ b/test/built-ins/Atomics/add/bad-range.js
@@ -9,9 +9,14 @@ includes: [testAtomics.js, testTypedArray.js]
 features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, arrow-function, let, TypedArray, for-of]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
+var sab = new SharedArrayBuffer(8);
 var views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  views.push(BigInt64Array);
+  views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     let view = new View(sab);
     testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
diff --git a/test/built-ins/Atomics/add/nonshared-int-views.js b/test/built-ins/Atomics/add/nonshared-int-views.js
index eb7b682fe3c9431b629e023f138f033cf79f24d8..1528abd3a0b007092b82f6802c9b7431b350995d 100644
--- a/test/built-ins/Atomics/add/nonshared-int-views.js
+++ b/test/built-ins/Atomics/add/nonshared-int-views.js
@@ -13,6 +13,11 @@ var ab = new ArrayBuffer(16);
 
 var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  int_views.push(BigInt64Array);
+  int_views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     var view = new View(ab);
 
diff --git a/test/built-ins/Atomics/and/bad-range.js b/test/built-ins/Atomics/and/bad-range.js
index 6215a6c47e6435cabc5d447e9ea478a8265fe725..fe91ae80196a8f7a7f3a6318ea7fdbbdb37f90e3 100644
--- a/test/built-ins/Atomics/and/bad-range.js
+++ b/test/built-ins/Atomics/and/bad-range.js
@@ -9,9 +9,14 @@ includes: [testAtomics.js, testTypedArray.js]
 features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, arrow-function, let, TypedArray, for-of]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
+var sab = new SharedArrayBuffer(8);
 var views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  views.push(BigInt64Array);
+  views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     let view = new View(sab);
     testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
diff --git a/test/built-ins/Atomics/and/nonshared-int-views.js b/test/built-ins/Atomics/and/nonshared-int-views.js
index 20e75cd53a45e0b0a91dd8f6d88665e044b25588..7184954bf3856fa34e4d0d1d2064a3a47753bdfb 100644
--- a/test/built-ins/Atomics/and/nonshared-int-views.js
+++ b/test/built-ins/Atomics/and/nonshared-int-views.js
@@ -13,6 +13,11 @@ var ab = new ArrayBuffer(16);
 
 var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  int_views.push(BigInt64Array);
+  int_views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     var view = new View(ab);
 
diff --git a/test/built-ins/Atomics/compareExchange/bad-range.js b/test/built-ins/Atomics/compareExchange/bad-range.js
index ddf0b61dc9d8fcc0e90afe41cdac7fdb84551ec4..11824fc57668065d872bf956021500ff6fa41f03 100644
--- a/test/built-ins/Atomics/compareExchange/bad-range.js
+++ b/test/built-ins/Atomics/compareExchange/bad-range.js
@@ -9,9 +9,14 @@ includes: [testAtomics.js, testTypedArray.js]
 features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, arrow-function, let, TypedArray, for-of]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
+var sab = new SharedArrayBuffer(8);
 var views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  views.push(BigInt64Array);
+  views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     let view = new View(sab);
     testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
diff --git a/test/built-ins/Atomics/compareExchange/nonshared-int-views.js b/test/built-ins/Atomics/compareExchange/nonshared-int-views.js
index ea5b99078410bcdbbab558e8a8067901e7c7ee5b..c3a95b239f1054c1651fb13d695972c18414e115 100644
--- a/test/built-ins/Atomics/compareExchange/nonshared-int-views.js
+++ b/test/built-ins/Atomics/compareExchange/nonshared-int-views.js
@@ -13,6 +13,11 @@ var ab = new ArrayBuffer(16);
 
 var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  int_views.push(BigInt64Array);
+  int_views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     var view = new View(ab);
 
diff --git a/test/built-ins/Atomics/exchange/bad-range.js b/test/built-ins/Atomics/exchange/bad-range.js
index cbafaecef6696b370a771e8a5018687542d83252..4392c1d78278519c7f903f4b0249b846f24f7754 100644
--- a/test/built-ins/Atomics/exchange/bad-range.js
+++ b/test/built-ins/Atomics/exchange/bad-range.js
@@ -9,9 +9,14 @@ includes: [testAtomics.js, testTypedArray.js]
 features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, arrow-function, let, TypedArray, for-of]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
+var sab = new SharedArrayBuffer(8);
 var views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  views.push(BigInt64Array);
+  views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     let view = new View(sab);
     testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
diff --git a/test/built-ins/Atomics/exchange/nonshared-int-views.js b/test/built-ins/Atomics/exchange/nonshared-int-views.js
index 7e71daf75a9db5b9cb0b71bf0a081445628cf7ea..30b7617d1547422428b8be093906e8bc78007eb8 100644
--- a/test/built-ins/Atomics/exchange/nonshared-int-views.js
+++ b/test/built-ins/Atomics/exchange/nonshared-int-views.js
@@ -13,6 +13,11 @@ var ab = new ArrayBuffer(16);
 
 var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  int_views.push(BigInt64Array);
+  int_views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     var view = new View(ab);
 
diff --git a/test/built-ins/Atomics/load/bad-range.js b/test/built-ins/Atomics/load/bad-range.js
index f09217eac51bcb2f87f915b96128be8c54f09358..d13ef4b5e3159280ab610b29e5d025e3ead5bf27 100644
--- a/test/built-ins/Atomics/load/bad-range.js
+++ b/test/built-ins/Atomics/load/bad-range.js
@@ -9,9 +9,14 @@ includes: [testAtomics.js, testTypedArray.js]
 features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, arrow-function, let, TypedArray, for-of]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
+var sab = new SharedArrayBuffer(8);
 var views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  views.push(BigInt64Array);
+  views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     let view = new View(sab);
     testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
diff --git a/test/built-ins/Atomics/load/nonshared-int-views.js b/test/built-ins/Atomics/load/nonshared-int-views.js
index 2beec220a0df9ab6e3c5a163cc4932041081bbdd..05eff959c4f7bf6aac0a4a193954d44615bf9121 100644
--- a/test/built-ins/Atomics/load/nonshared-int-views.js
+++ b/test/built-ins/Atomics/load/nonshared-int-views.js
@@ -13,6 +13,11 @@ var ab = new ArrayBuffer(16);
 
 var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  int_views.push(BigInt64Array);
+  int_views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     var view = new View(ab);
 
diff --git a/test/built-ins/Atomics/or/bad-range.js b/test/built-ins/Atomics/or/bad-range.js
index 0c17b9eb95dc8eb152627c6595311b62d30d6c00..a9fab884a603094a28dbca7c0b647c4325e177f0 100644
--- a/test/built-ins/Atomics/or/bad-range.js
+++ b/test/built-ins/Atomics/or/bad-range.js
@@ -9,9 +9,14 @@ includes: [testAtomics.js, testTypedArray.js]
 features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, arrow-function, let, TypedArray, for-of]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
+var sab = new SharedArrayBuffer(8);
 var views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  views.push(BigInt64Array);
+  views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     let view = new View(sab);
     testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
diff --git a/test/built-ins/Atomics/or/nonshared-int-views.js b/test/built-ins/Atomics/or/nonshared-int-views.js
index 1560e576624e5b033deec28b80117745dfcf7f04..033174fcf9441d69ee798968fcd1e63c78fcb51f 100644
--- a/test/built-ins/Atomics/or/nonshared-int-views.js
+++ b/test/built-ins/Atomics/or/nonshared-int-views.js
@@ -13,6 +13,11 @@ var ab = new ArrayBuffer(16);
 
 var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  int_views.push(BigInt64Array);
+  int_views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     var view = new View(ab);
 
diff --git a/test/built-ins/Atomics/store/bad-range.js b/test/built-ins/Atomics/store/bad-range.js
index ebc42e894bce7a5a67312192fe9b3c720d77298f..69a402646c9b5a74dda5b461277c5c096a82e679 100644
--- a/test/built-ins/Atomics/store/bad-range.js
+++ b/test/built-ins/Atomics/store/bad-range.js
@@ -9,9 +9,14 @@ includes: [testAtomics.js, testTypedArray.js]
 features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, arrow-function, let, TypedArray, for-of]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
+var sab = new SharedArrayBuffer(8);
 var views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  views.push(BigInt64Array);
+  views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     let view = new View(sab);
     testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
diff --git a/test/built-ins/Atomics/store/nonshared-int-views.js b/test/built-ins/Atomics/store/nonshared-int-views.js
index bb9bdc51b81d9169d596b4a00b60550e9f54b9c9..0153ed2fc1a1e23b59e98580d2562685c7832a41 100644
--- a/test/built-ins/Atomics/store/nonshared-int-views.js
+++ b/test/built-ins/Atomics/store/nonshared-int-views.js
@@ -13,6 +13,11 @@ var ab = new ArrayBuffer(16);
 
 var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  int_views.push(BigInt64Array);
+  int_views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     var view = new View(ab);
 
diff --git a/test/built-ins/Atomics/sub/bad-range.js b/test/built-ins/Atomics/sub/bad-range.js
index d390e5a7e3535a51bf438e9425b7e4725290f0f0..dabd7789e7e1d96fe6dd96aec7a20461751c07b8 100644
--- a/test/built-ins/Atomics/sub/bad-range.js
+++ b/test/built-ins/Atomics/sub/bad-range.js
@@ -9,9 +9,14 @@ includes: [testAtomics.js, testTypedArray.js]
 features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, arrow-function, let, TypedArray, for-of]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
+var sab = new SharedArrayBuffer(8);
 var views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  views.push(BigInt64Array);
+  views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     let view = new View(sab);
     testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
diff --git a/test/built-ins/Atomics/sub/nonshared-int-views.js b/test/built-ins/Atomics/sub/nonshared-int-views.js
index 7961f0faafbc4ee43bf1930e4b207176dbcece06..7383307f7dc71d7995431d9c61172e5bcd80b24a 100644
--- a/test/built-ins/Atomics/sub/nonshared-int-views.js
+++ b/test/built-ins/Atomics/sub/nonshared-int-views.js
@@ -13,6 +13,11 @@ var ab = new ArrayBuffer(16);
 
 var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  int_views.push(BigInt64Array);
+  int_views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     var view = new View(ab);
 
diff --git a/test/built-ins/Atomics/wait/bad-range.js b/test/built-ins/Atomics/wait/bad-range.js
index 9e0cdfffd45719d9dcc9a08227bb834fe5f06a8b..680caf7bac5578fc626bd526a192947993be6c56 100644
--- a/test/built-ins/Atomics/wait/bad-range.js
+++ b/test/built-ins/Atomics/wait/bad-range.js
@@ -5,14 +5,21 @@
 esid: sec-atomics.wait
 description: >
   Test range checking of Atomics.wait on arrays that allow atomic operations
-includes: [testAtomics.js]
-features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, arrow-function, let, for-of]
+includes: [testAtomics.js, testTypedArray.js]
+features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, TypedArray, arrow-function, let, for-of]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
-var view = new Int32Array(sab);
+var sab = new SharedArrayBuffer(8);
+var views = [Int32Array];
 
-testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
+if (typeof BigInt !== "undefined") {
+  views.push(BigInt64Array);
+}
+
+testWithTypedArrayConstructors(function(View) {
+  let view = new View(sab);
+  testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
     let Idx = IdxGen(view);
     assert.throws(RangeError, () => Atomics.wait(view, Idx, 10, 0)); // Even with zero timeout
-});
+  });
+}, views);
diff --git a/test/built-ins/Atomics/wait/nonshared-int-views.js b/test/built-ins/Atomics/wait/nonshared-int-views.js
index 40019282900b42ae3a9916f5c747f0ec18ea33bd..c4a5fb4b02bd301e9d9c3f0c23e22f32ba852a02 100644
--- a/test/built-ins/Atomics/wait/nonshared-int-views.js
+++ b/test/built-ins/Atomics/wait/nonshared-int-views.js
@@ -13,6 +13,11 @@ var ab = new ArrayBuffer(16);
 
 var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  int_views.push(BigInt64Array);
+  int_views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     var view = new View(ab);
 
diff --git a/test/built-ins/Atomics/wake/bad-range.js b/test/built-ins/Atomics/wake/bad-range.js
index bdd5d282a6cb63ccaab2f059da9fb6c9923c86f0..248501b53e01629831f5dfc6ac08b5490f3abc1b 100644
--- a/test/built-ins/Atomics/wake/bad-range.js
+++ b/test/built-ins/Atomics/wake/bad-range.js
@@ -5,14 +5,21 @@
 esid: sec-atomics.wake
 description: >
   Test range checking of Atomics.wake on arrays that allow atomic operations
-includes: [testAtomics.js]
-features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, arrow-function, let, for-of]
+includes: [testAtomics.js, testTypedArray.js]
+features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, TypedArray, arrow-function, let, for-of]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
-var view = new Int32Array(sab);
+var sab = new SharedArrayBuffer(8);
+var views = [Int32Array];
 
-testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
+if (typeof BigInt !== "undefined") {
+  views.push(BigInt64Array);
+}
+
+testWithTypedArrayConstructors(function(View) {
+  let view = new View(sab);
+  testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
     let Idx = IdxGen(view);
     assert.throws(RangeError, () => Atomics.wake(view, Idx, 0)); // Even with waking zero
-});
+  });
+}, views);
diff --git a/test/built-ins/Atomics/wake/nonshared-int-views.js b/test/built-ins/Atomics/wake/nonshared-int-views.js
index d4e197846eb5ea1ba6c90c7c9e3c78cafadb43b1..8e86e23858052b62046b264b051f91788dfaf7db 100644
--- a/test/built-ins/Atomics/wake/nonshared-int-views.js
+++ b/test/built-ins/Atomics/wake/nonshared-int-views.js
@@ -13,6 +13,11 @@ var ab = new ArrayBuffer(16);
 
 var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  int_views.push(BigInt64Array);
+  int_views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     var view = new View(ab);
 
diff --git a/test/built-ins/Atomics/xor/bad-range.js b/test/built-ins/Atomics/xor/bad-range.js
index 643b8138d4b111933f72a94e8ed87de402bc4d54..151986926308d66a1a31af0950ff8dca3127cd02 100644
--- a/test/built-ins/Atomics/xor/bad-range.js
+++ b/test/built-ins/Atomics/xor/bad-range.js
@@ -9,9 +9,14 @@ includes: [testAtomics.js, testTypedArray.js]
 features: [SharedArrayBuffer, ArrayBuffer, DataView, Atomics, arrow-function, let, TypedArray, for-of]
 ---*/
 
-var sab = new SharedArrayBuffer(4);
+var sab = new SharedArrayBuffer(8);
 var views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  views.push(BigInt64Array);
+  views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     let view = new View(sab);
     testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
diff --git a/test/built-ins/Atomics/xor/nonshared-int-views.js b/test/built-ins/Atomics/xor/nonshared-int-views.js
index 0c1dca77b92bb6e8f533753954bc9e88e24a3a64..0ab8b408e006375fd90153bd3e5ea259d8767b1f 100644
--- a/test/built-ins/Atomics/xor/nonshared-int-views.js
+++ b/test/built-ins/Atomics/xor/nonshared-int-views.js
@@ -13,6 +13,11 @@ var ab = new ArrayBuffer(16);
 
 var int_views = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array];
 
+if (typeof BigInt !== "undefined") {
+  int_views.push(BigInt64Array);
+  int_views.push(BigUint64Array);
+}
+
 testWithTypedArrayConstructors(function(View) {
     var view = new View(ab);