diff --git a/test/built-ins/Atomics/isLockFree/bigint/expected-return-value.js b/test/built-ins/Atomics/isLockFree/bigint/expected-return-value.js
index 1213d6e1cd..56a0186f51 100644
--- a/test/built-ins/Atomics/isLockFree/bigint/expected-return-value.js
+++ b/test/built-ins/Atomics/isLockFree/bigint/expected-return-value.js
@@ -18,7 +18,7 @@ info: |
   6. If n equals 8, return AR.[[IsLockFree8]].
   7. Return false.
 
-features: [Atomics, SharedArrayBuffer, TypedArray]
+features: [Atomics, BigInt, SharedArrayBuffer, TypedArray]
 includes: [testBigIntTypedArray.js]
 ---*/
 
diff --git a/test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-store-padded-time.js b/test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-store-padded-time.js
index 5a6461d36c..7aa69020d6 100644
--- a/test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-store-padded-time.js
+++ b/test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-store-padded-time.js
@@ -7,7 +7,7 @@ description: >
   Test that Atomics.wait actually waits and does not spuriously wake
   up when the memory value is changed.
 includes: [atomicsHelper.js]
-features: [Atomics, SharedArrayBuffer, TypedArray]
+features: [Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
 $262.agent.start(`
diff --git a/test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-store.js b/test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-store.js
index 5c43128336..0dee43eb5a 100644
--- a/test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-store.js
+++ b/test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-store.js
@@ -5,7 +5,7 @@
 esid: sec-atomics.wait
 description: >
   Demonstrates that Atomics.store(...) is causing a waiting
-features: [Atomics, computed-property-names, SharedArrayBuffer, TypedArray]
+features: [Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 function getReport() {
   var r;
diff --git a/test/built-ins/Atomics/wait/bigint/non-shared-bufferdata-throws.js b/test/built-ins/Atomics/wait/bigint/non-shared-bufferdata-throws.js
index 9322fff966..9bb706ff59 100644
--- a/test/built-ins/Atomics/wait/bigint/non-shared-bufferdata-throws.js
+++ b/test/built-ins/Atomics/wait/bigint/non-shared-bufferdata-throws.js
@@ -12,8 +12,7 @@ info: |
       9.If IsSharedArrayBuffer(buffer) is false, throw a TypeError exception.
         ...
           4.If bufferData is a Data Block, return false.
-features: [ArrayBuffer, Atomics, TypedArray]
-includes: [testAtomics.js, testBigIntTypedArray.js]
+features: [ArrayBuffer, Atomics, BigInt, TypedArray]
 ---*/
 
 var i64a = new BigInt64Array(new ArrayBuffer(4));
diff --git a/test/built-ins/Atomics/wait/bigint/null-bufferdata-throws.js b/test/built-ins/Atomics/wait/bigint/null-bufferdata-throws.js
index cf640b2910..3707ceafe1 100644
--- a/test/built-ins/Atomics/wait/bigint/null-bufferdata-throws.js
+++ b/test/built-ins/Atomics/wait/bigint/null-bufferdata-throws.js
@@ -13,7 +13,7 @@ info: |
         ...
           3.If bufferData is null, return false.
 includes: [detachArrayBuffer.js]
-features: [ArrayBuffer, BigInt, Atomics, TypedArray]
+features: [ArrayBuffer, Atomics, BigInt, TypedArray]
 ---*/
 
 var i64a = new BigInt64Array(new ArrayBuffer(1024));
diff --git a/test/built-ins/Atomics/wait/bigint/value-not-equal.js b/test/built-ins/Atomics/wait/bigint/value-not-equal.js
index 9e41c30404..3541a6409f 100644
--- a/test/built-ins/Atomics/wait/bigint/value-not-equal.js
+++ b/test/built-ins/Atomics/wait/bigint/value-not-equal.js
@@ -14,8 +14,7 @@ info: |
     a.Perform LeaveCriticalSection(WL).
     b. Return the String "not-equal".
 
-features: [Atomics, SharedArrayBuffer, TypedArray]
-includes: [atomicsHelper.js, testBigIntTypedArray.js]
+features: [Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
 function getReport() {
diff --git a/test/built-ins/Atomics/wait/bigint/was-woken.js b/test/built-ins/Atomics/wait/bigint/was-woken.js
index 2d4f20577e..eedac503fb 100644
--- a/test/built-ins/Atomics/wait/bigint/was-woken.js
+++ b/test/built-ins/Atomics/wait/bigint/was-woken.js
@@ -5,8 +5,7 @@
 esid: sec-atomics.wait
 description: >
   Test that Atomics.wait returns the right result when it was awoken.
-features: [Atomics, SharedArrayBuffer, TypedArray]
-includes: [testAtomics.js, testBigIntTypedArray.js]
+features: [Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
 function getReport() {
diff --git a/test/built-ins/Atomics/wake/bigint/non-bigint64-typedarray-throws.js b/test/built-ins/Atomics/wake/bigint/non-bigint64-typedarray-throws.js
index 12108e3b02..6b9b760d7c 100644
--- a/test/built-ins/Atomics/wake/bigint/non-bigint64-typedarray-throws.js
+++ b/test/built-ins/Atomics/wake/bigint/non-bigint64-typedarray-throws.js
@@ -12,7 +12,7 @@ info: |
     ...
       5.If onlyInt32 is true, then
         If typeName is not "BigInt64Array", throw a TypeError exception.
-features: [Atomics, BigInt]
+features: [Atomics, BigInt, TypedArray]
 ---*/
 
 var poisoned = {
diff --git a/test/built-ins/Atomics/wake/bigint/non-shared-bufferdata-throws.js b/test/built-ins/Atomics/wake/bigint/non-shared-bufferdata-throws.js
index 43185fbceb..042f66707f 100644
--- a/test/built-ins/Atomics/wake/bigint/non-shared-bufferdata-throws.js
+++ b/test/built-ins/Atomics/wake/bigint/non-shared-bufferdata-throws.js
@@ -12,7 +12,7 @@ info: |
       9.If IsSharedArrayBuffer(buffer) is false, throw a TypeError exception.
         ...
           4.If bufferData is a Data Block, return false.
-features: [ArrayBuffer, BigInt, Atomics, TypedArray]
+features: [ArrayBuffer, Atomics, BigInt, TypedArray]
 ---*/
 
 var i64a = new BigInt64Array(new ArrayBuffer(4));
diff --git a/test/built-ins/Atomics/wake/bigint/null-bufferdata-throws.js b/test/built-ins/Atomics/wake/bigint/null-bufferdata-throws.js
index 0e46e207a6..3981e9200e 100644
--- a/test/built-ins/Atomics/wake/bigint/null-bufferdata-throws.js
+++ b/test/built-ins/Atomics/wake/bigint/null-bufferdata-throws.js
@@ -13,7 +13,7 @@ info: |
         ...
           3.If bufferData is null, return false.
 includes: [detachArrayBuffer.js]
-features: [ArrayBuffer, BigInt, Atomics, TypedArray]
+features: [ArrayBuffer, Atomics, BigInt, TypedArray]
 ---*/
 
 var i64a = new BigInt64Array(new ArrayBuffer(1024));