diff --git a/test/built-ins/TypedArray/prototype/fill/BigInt/return-abrupt-from-end-as-symbol.js b/test/built-ins/TypedArray/prototype/fill/BigInt/return-abrupt-from-end-as-symbol.js
index 084c9ac1e756ecebce17172d4955f6f2feeb6dbc..69ad955b68fe5d31e0757e93f60f170fb353f618 100644
--- a/test/built-ins/TypedArray/prototype/fill/BigInt/return-abrupt-from-end-as-symbol.js
+++ b/test/built-ins/TypedArray/prototype/fill/BigInt/return-abrupt-from-end-as-symbol.js
@@ -33,6 +33,6 @@ var end = Symbol(1);
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
   assert.throws(TypeError, function() {
-    sample.fill(1, 0, end);
+    sample.fill(1n, 0, end);
   });
 });
diff --git a/test/built-ins/TypedArray/prototype/fill/BigInt/return-abrupt-from-start-as-symbol.js b/test/built-ins/TypedArray/prototype/fill/BigInt/return-abrupt-from-start-as-symbol.js
index d95c9a30d87e0b328f7a6c90ab28b626e5a2167a..73c241786768ceb071f5de9fae89727fa8dc4f87 100644
--- a/test/built-ins/TypedArray/prototype/fill/BigInt/return-abrupt-from-start-as-symbol.js
+++ b/test/built-ins/TypedArray/prototype/fill/BigInt/return-abrupt-from-start-as-symbol.js
@@ -32,6 +32,6 @@ var start = Symbol(1);
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
   assert.throws(TypeError, function() {
-    sample.fill(1, start);
+    sample.fill(1n, start);
   });
 });
diff --git a/test/built-ins/TypedArray/prototype/includes/BigInt/detached-buffer.js b/test/built-ins/TypedArray/prototype/includes/BigInt/detached-buffer.js
index 990e4b01a8a3bc76df961c8cc5498a10b0ce5a4b..0239cca34aa45fb9564e90447fd7f70db7c77150 100644
--- a/test/built-ins/TypedArray/prototype/includes/BigInt/detached-buffer.js
+++ b/test/built-ins/TypedArray/prototype/includes/BigInt/detached-buffer.js
@@ -23,6 +23,6 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA(1);
   $DETACHBUFFER(sample.buffer);
   assert.throws(TypeError, function() {
-    sample.includes(0);
+    sample.includes(0n);
   });
 });
diff --git a/test/built-ins/TypedArray/prototype/includes/BigInt/fromIndex-equal-or-greater-length-returns-false.js b/test/built-ins/TypedArray/prototype/includes/BigInt/fromIndex-equal-or-greater-length-returns-false.js
index a59b7084a562c7b25b2177900e33a378661b4abe..a36d4d415b67fc53524ec60e062187b0eb53fa4d 100644
--- a/test/built-ins/TypedArray/prototype/includes/BigInt/fromIndex-equal-or-greater-length-returns-false.js
+++ b/test/built-ins/TypedArray/prototype/includes/BigInt/fromIndex-equal-or-greater-length-returns-false.js
@@ -31,6 +31,6 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   var sample;
 
   sample = new TA(42);
-  assert.sameValue(sample.includes(0, 42), false);
-  assert.sameValue(sample.includes(0, 43), false);
+  assert.sameValue(sample.includes(0n, 42), false);
+  assert.sameValue(sample.includes(0n, 43), false);
 });
diff --git a/test/built-ins/TypedArray/prototype/includes/BigInt/length-zero-returns-false.js b/test/built-ins/TypedArray/prototype/includes/BigInt/length-zero-returns-false.js
index 9c06fa6c1dda52f689025c2332fcf10e02b585de..1ceaa37bc919ac9e5c23cee6d1986b5f8fa4cde3 100644
--- a/test/built-ins/TypedArray/prototype/includes/BigInt/length-zero-returns-false.js
+++ b/test/built-ins/TypedArray/prototype/includes/BigInt/length-zero-returns-false.js
@@ -33,7 +33,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   assert.sameValue(sample.includes(0), false, "returns false");
   assert.sameValue(sample.includes(), false, "returns false - no arg");
   assert.sameValue(
-    sample.includes(0, fromIndex), false,
+    sample.includes(0n, fromIndex), false,
     "length is checked before ToInteger(fromIndex)"
   );
 });
diff --git a/test/built-ins/TypedArray/prototype/indexOf/BigInt/detached-buffer.js b/test/built-ins/TypedArray/prototype/indexOf/BigInt/detached-buffer.js
index 1d44ab16d85d59d6f283982235fe596abe0b41fc..757baf77c7c44935b099ea05ea24a09934822c03 100644
--- a/test/built-ins/TypedArray/prototype/indexOf/BigInt/detached-buffer.js
+++ b/test/built-ins/TypedArray/prototype/indexOf/BigInt/detached-buffer.js
@@ -23,6 +23,6 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA(1);
   $DETACHBUFFER(sample.buffer);
   assert.throws(TypeError, function() {
-    sample.indexOf(0);
+    sample.indexOf(0n);
   });
 });
diff --git a/test/built-ins/TypedArray/prototype/indexOf/BigInt/fromIndex-equal-or-greater-length-returns-minus-one.js b/test/built-ins/TypedArray/prototype/indexOf/BigInt/fromIndex-equal-or-greater-length-returns-minus-one.js
index 022f4a15679ba6dd1c3a554526a1cfa47ffd81ee..a7bc3e50a0e95a954682af59c838e893ce2cc703 100644
--- a/test/built-ins/TypedArray/prototype/indexOf/BigInt/fromIndex-equal-or-greater-length-returns-minus-one.js
+++ b/test/built-ins/TypedArray/prototype/indexOf/BigInt/fromIndex-equal-or-greater-length-returns-minus-one.js
@@ -25,6 +25,6 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   var sample;
 
   sample = new TA(42);
-  assert.sameValue(sample.indexOf(0, 42), -1);
-  assert.sameValue(sample.indexOf(0, 43), -1);
+  assert.sameValue(sample.indexOf(0n, 42), -1);
+  assert.sameValue(sample.indexOf(0n, 43), -1);
 });
diff --git a/test/built-ins/TypedArray/prototype/indexOf/BigInt/length-zero-returns-minus-one.js b/test/built-ins/TypedArray/prototype/indexOf/BigInt/length-zero-returns-minus-one.js
index 510a58f7bbf1575a180e0d5c6427c9ac5c49a345..2c679e491450e951761eb859b143fe8ae16509fe 100644
--- a/test/built-ins/TypedArray/prototype/indexOf/BigInt/length-zero-returns-minus-one.js
+++ b/test/built-ins/TypedArray/prototype/indexOf/BigInt/length-zero-returns-minus-one.js
@@ -29,9 +29,9 @@ var fromIndex = {
 
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
-  assert.sameValue(sample.indexOf(0), -1, "returns -1");
+  assert.sameValue(sample.indexOf(0n), -1, "returns -1");
   assert.sameValue(
-    sample.indexOf(0, fromIndex), -1,
+    sample.indexOf(0n, fromIndex), -1,
     "length is checked before ToInteger(fromIndex)"
   );
 });
diff --git a/test/built-ins/TypedArray/prototype/indexOf/BigInt/return-abrupt-tointeger-fromindex-symbol.js b/test/built-ins/TypedArray/prototype/indexOf/BigInt/return-abrupt-tointeger-fromindex-symbol.js
index 843a22a29cdee6e4991469e19d9d382393be6429..a4e3dfccbc19630cbba71970e2b4f8e2533d11c8 100644
--- a/test/built-ins/TypedArray/prototype/indexOf/BigInt/return-abrupt-tointeger-fromindex-symbol.js
+++ b/test/built-ins/TypedArray/prototype/indexOf/BigInt/return-abrupt-tointeger-fromindex-symbol.js
@@ -27,6 +27,6 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA(1);
 
   assert.throws(TypeError, function() {
-    sample.indexOf(7, fromIndex);
+    sample.indexOf(7n, fromIndex);
   });
 });
diff --git a/test/built-ins/TypedArray/prototype/indexOf/BigInt/return-abrupt-tointeger-fromindex.js b/test/built-ins/TypedArray/prototype/indexOf/BigInt/return-abrupt-tointeger-fromindex.js
index 751b482b93aa6fd1c40055841588896871b3369d..f5063efa0615d77504cbd630428e9318b8fdeba5 100644
--- a/test/built-ins/TypedArray/prototype/indexOf/BigInt/return-abrupt-tointeger-fromindex.js
+++ b/test/built-ins/TypedArray/prototype/indexOf/BigInt/return-abrupt-tointeger-fromindex.js
@@ -31,6 +31,6 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA(1);
 
   assert.throws(Test262Error, function() {
-    sample.indexOf(7, fromIndex);
+    sample.indexOf(7n, fromIndex);
   });
 });
diff --git a/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/detached-buffer.js b/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/detached-buffer.js
index 616f96ce5a95214eb4f84f32fedfa3b85017950e..70e471654c09c89187bae093cd83bf8a04b9ff4c 100644
--- a/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/detached-buffer.js
+++ b/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/detached-buffer.js
@@ -23,6 +23,6 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA(1);
   $DETACHBUFFER(sample.buffer);
   assert.throws(TypeError, function() {
-    sample.lastIndexOf(0);
+    sample.lastIndexOf(0n);
   });
 });
diff --git a/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/length-zero-returns-minus-one.js b/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/length-zero-returns-minus-one.js
index 07fc5da7266fb0d5cddc434f4d5e1e1b5b5a888e..9676e2d5df08147d351500d2810802ddaf112dde 100644
--- a/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/length-zero-returns-minus-one.js
+++ b/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/length-zero-returns-minus-one.js
@@ -31,7 +31,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA();
   assert.sameValue(sample.lastIndexOf(0), -1, "returns -1");
   assert.sameValue(
-    sample.lastIndexOf(0, fromIndex), -1,
+    sample.lastIndexOf(0n, fromIndex), -1,
     "length is checked before ToInteger(fromIndex)"
   );
 });
diff --git a/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/return-abrupt-tointeger-fromindex-symbol.js b/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/return-abrupt-tointeger-fromindex-symbol.js
index 67c1ea4c62a78866b419b0a9f6da813e695ce0d7..5f4f01d63d38bd3c3e6238cba691c30bea2f7074 100644
--- a/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/return-abrupt-tointeger-fromindex-symbol.js
+++ b/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/return-abrupt-tointeger-fromindex-symbol.js
@@ -27,6 +27,6 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA(1);
 
   assert.throws(TypeError, function() {
-    sample.lastIndexOf(7, fromIndex);
+    sample.lastIndexOf(7n, fromIndex);
   });
 });
diff --git a/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/return-abrupt-tointeger-fromindex.js b/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/return-abrupt-tointeger-fromindex.js
index 2f3465b343a1614ad24cb3cffd21c9ff8c07a9a5..ca2eb82d71611bbf49c1924631a729d74795cd70 100644
--- a/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/return-abrupt-tointeger-fromindex.js
+++ b/test/built-ins/TypedArray/prototype/lastIndexOf/BigInt/return-abrupt-tointeger-fromindex.js
@@ -31,6 +31,6 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA(1);
 
   assert.throws(Test262Error, function() {
-    sample.lastIndexOf(7, fromIndex);
+    sample.lastIndexOf(7n, fromIndex);
   });
 });
diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-sab.js b/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-sab.js
index 344aceeda0be62efe2df1fff152b98792a8e5214..3145bc807596b1b54b6041ea58129ae960a67b22 100644
--- a/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-sab.js
+++ b/test/built-ins/TypedArray/prototype/set/BigInt/typedarray-arg-set-values-diff-buffer-other-type-sab.js
@@ -13,7 +13,8 @@ features: [BigInt, SharedArrayBuffer, TypedArray]
 
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sab = new SharedArrayBuffer(2 * BigInt64Array.BYTES_PER_ELEMENT);
-  var src = new BigInt64Array(sab);
+  var otherCtor = TA === BigInt64Array ? BigUint64Array : BigInt64Array;
+  var src = new otherCtor(sab);
   src[0] = 42n;
   src[1] = 43n;
   var sample, result;
diff --git a/test/built-ins/TypedArray/prototype/sort/BigInt/sortcompare-with-no-tostring.js b/test/built-ins/TypedArray/prototype/sort/BigInt/sortcompare-with-no-tostring.js
index 3f6402c667302dd36cae07f8099e9a62385c4dee..f588b36bcc32ef415a45c341afac2d1fbab06fb3 100644
--- a/test/built-ins/TypedArray/prototype/sort/BigInt/sortcompare-with-no-tostring.js
+++ b/test/built-ins/TypedArray/prototype/sort/BigInt/sortcompare-with-no-tostring.js
@@ -18,10 +18,14 @@ includes: [testBigIntTypedArray.js, compareArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
-var origToString = Number.prototype.toString;
+var toStringCalled = false;
+BigInt.prototype.toString = function() {
+  toStringCalled = true;
+}
 
 testWithBigIntTypedArrayConstructors(function(TA) {
   var sample = new TA([20n, 100n, 3n]);
   var result = sample.sort();
+  assert.sameValue(toStringCalled, false, "BigInt.prototype.toString will not be called");
   assert(compareArray(result, [3n, 20n, 100n]));
 });
diff --git a/test/built-ins/TypedArray/prototype/sort/sortcompare-with-no-tostring.js b/test/built-ins/TypedArray/prototype/sort/sortcompare-with-no-tostring.js
index f3bb0cac038ce31b8c9f84d705bbc3097e4c344c..591c9087b0728f75224e04e142ca2d512011c23e 100644
--- a/test/built-ins/TypedArray/prototype/sort/sortcompare-with-no-tostring.js
+++ b/test/built-ins/TypedArray/prototype/sort/sortcompare-with-no-tostring.js
@@ -18,10 +18,14 @@ includes: [testTypedArray.js, compareArray.js]
 features: [TypedArray]
 ---*/
 
-var origToString = Number.prototype.toString;
+var toStringCalled = false;
+Number.prototype.toString = function() {
+  toStringCalled = true;
+}
 
 testWithTypedArrayConstructors(function(TA) {
   var sample = new TA([20, 100, 3]);
   var result = sample.sort();
-  assert(compareArray(result, [3, 20, 100]));
+  assert.sameValue(toStringCalled, false, "Number.prototype.toString will not be called");
+  assert(compareArray(result, [3, 20, 100]), "Default sorting by value");
 });
diff --git a/test/built-ins/TypedArrayConstructors/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget-sab.js b/test/built-ins/TypedArrayConstructors/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget-sab.js
index 10f1c12faf7ad0d514d4a0427b9e20ddc955082e..4b242832d94efd6926db27deb73fd2056547fbe2 100644
--- a/test/built-ins/TypedArrayConstructors/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget-sab.js
+++ b/test/built-ins/TypedArrayConstructors/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget-sab.js
@@ -20,7 +20,7 @@ features: [BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  var buffer = new SharedArrayBuffer(4);
+  var buffer = new SharedArrayBuffer(TA.BYTES_PER_ELEMENT);
   assert.throws(TypeError, function() {
     TA(buffer);
   });
diff --git a/test/built-ins/TypedArrayConstructors/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget.js b/test/built-ins/TypedArrayConstructors/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget.js
index c746dc188930d4cacf4f3bb101f5dc83b860749d..623c193af79e6cf571e020fc825fe98be7d2ac45 100644
--- a/test/built-ins/TypedArrayConstructors/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget.js
+++ b/test/built-ins/TypedArrayConstructors/ctors-bigint/buffer-arg/invoked-with-undefined-newtarget.js
@@ -19,7 +19,7 @@ features: [BigInt, TypedArray]
 ---*/
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  var buffer = new ArrayBuffer(4);
+  var buffer = new ArrayBuffer(TA.BYTES_PER_ELEMENT);
   assert.throws(TypeError, function() {
     TA(buffer);
   });
diff --git a/test/built-ins/TypedArrayConstructors/ctors-bigint/typedarray-arg/other-ctor-buffer-ctor-access-throws.js b/test/built-ins/TypedArrayConstructors/ctors-bigint/typedarray-arg/other-ctor-buffer-ctor-access-throws.js
index 686c020080cb40feb5b5a2b039e3da12f06401de..3882f1c78e8619b508a46b5b3b70aed348b51dd9 100644
--- a/test/built-ins/TypedArrayConstructors/ctors-bigint/typedarray-arg/other-ctor-buffer-ctor-access-throws.js
+++ b/test/built-ins/TypedArrayConstructors/ctors-bigint/typedarray-arg/other-ctor-buffer-ctor-access-throws.js
@@ -26,7 +26,7 @@ features: [BigInt, TypedArray]
 ---*/
 
 testWithBigIntTypedArrayConstructors(function(TA) {
-  var OtherCtor = TA === Int8Array ? Int16Array : Int8Array;
+  var OtherCtor = TA === BigInt64Array ? BigUint64Array : BigInt64Array;
   var sample = new OtherCtor();
 
   Object.defineProperty(sample.buffer, "constructor", {
diff --git a/test/built-ins/TypedArrayConstructors/from/BigInt/custom-ctor-returns-smaller-instance-throws.js b/test/built-ins/TypedArrayConstructors/from/BigInt/custom-ctor-returns-smaller-instance-throws.js
index 8c2a128d0c6d438abc972715246b4d6d0e7a6235..2726aac56588e943af0b9d6053f8d6cd968195b7 100644
--- a/test/built-ins/TypedArrayConstructors/from/BigInt/custom-ctor-returns-smaller-instance-throws.js
+++ b/test/built-ins/TypedArrayConstructors/from/BigInt/custom-ctor-returns-smaller-instance-throws.js
@@ -22,7 +22,7 @@ includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol.iterator, TypedArray]
 ---*/
 
-var sourceItor = [1, 2];
+var sourceItor = [1n, 2n];
 var sourceObj = {
   length: 2
 };
diff --git a/test/built-ins/TypedArrayConstructors/from/BigInt/mapfn-abrupt-completion.js b/test/built-ins/TypedArrayConstructors/from/BigInt/mapfn-abrupt-completion.js
index 4efbf68faa2ad85a9f9b8fa34e7641053f3315f5..82bdcadf3f8ebb10d7673eb3658773cf463decd0 100644
--- a/test/built-ins/TypedArrayConstructors/from/BigInt/mapfn-abrupt-completion.js
+++ b/test/built-ins/TypedArrayConstructors/from/BigInt/mapfn-abrupt-completion.js
@@ -18,7 +18,7 @@ features: [BigInt, TypedArray]
 ---*/
 
 var source = {
-  "0": 42,
+  "0": 42n,
   length: 2
 };
 var mapfn = function() {
diff --git a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/detached-buffer-realm.js b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/detached-buffer-realm.js
index 3fa462103a1b867ac12b168464dc5cc79006c23f..52d2ad0950dc71f979388627a2a628bf91d4881d 100644
--- a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/detached-buffer-realm.js
+++ b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/detached-buffer-realm.js
@@ -29,7 +29,7 @@ features: [BigInt, cross-realm, Reflect, TypedArray]
 
 var other = $262.createRealm().global;
 var desc = {
-  value: 0,
+  value: 0n,
   configurable: false,
   enumerable: true,
   writable: true
diff --git a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/detached-buffer.js b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/detached-buffer.js
index f20176156637cd6f60eaf231d14570e3e831675b..17417b995dd99fb76a3760b36c01cbf2a09698a5 100644
--- a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/detached-buffer.js
+++ b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/detached-buffer.js
@@ -27,7 +27,7 @@ features: [BigInt, Reflect, TypedArray]
 ---*/
 
 var desc = {
-  value: 0,
+  value: 0n,
   configurable: false,
   enumerable: true,
   writable: true
diff --git a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-greater-than-last-index.js b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-greater-than-last-index.js
index c558041e1568db1c3fc26a9e4a0c90a2d8c18008..3177065146734b565730d1b4d24213fe8d17f946 100644
--- a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-greater-than-last-index.js
+++ b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-greater-than-last-index.js
@@ -25,7 +25,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "2", {
-      value: 42,
+      value: 42n,
       configurable: false,
       enumerable: true,
       writable: true
@@ -36,7 +36,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "3", {
-      value: 42,
+      value: 42n,
       configurable: false,
       enumerable: true,
       writable: true
diff --git a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-lower-than-zero.js b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-lower-than-zero.js
index c9ff538985f46badd39c6c569b1ee151ca44e479..b2afcf4853cd66bae8e3d07bf5c6eef1f1ed493c 100644
--- a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-lower-than-zero.js
+++ b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-lower-than-zero.js
@@ -23,7 +23,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "-1", {
-      value: 42,
+      value: 42n,
       configurable: false,
       enumerable: true,
       writable: true
diff --git a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-minus-zero.js b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-minus-zero.js
index 73dcde780b0329c1b5cb7c4fb194d9c57b209c71..a45c75dbe4948c57c10286eb122f33a1aecf0c6a 100644
--- a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-minus-zero.js
+++ b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-minus-zero.js
@@ -23,7 +23,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "-0", {
-      value: 42,
+      value: 42n,
       configurable: false,
       enumerable: true,
       writable: true
diff --git a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-not-integer.js b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-not-integer.js
index 15bc69fb42d2344071c56521df974d38b6d2a98c..e4a90f0ec5ded4b7b4a2c785c60532a3eb0fdac4 100644
--- a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-not-integer.js
+++ b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-not-integer.js
@@ -21,7 +21,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "0.1", {
-      value: 42,
+      value: 42n,
       configurable: false,
       enumerable: true,
       writable: true
@@ -38,7 +38,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "0.000001", {
-      value: 42,
+      value: 42n,
       configurable: false,
       enumerable: true,
       writable: true
@@ -58,7 +58,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "1.1", {
-      value: 42,
+      value: 42n,
       configurable: false,
       enumerable: true,
       writable: true
@@ -75,7 +75,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "Infinity", {
-      value: 42,
+      value: 42n,
       configurable: false,
       enumerable: true,
       writable: true
@@ -99,7 +99,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "-Infinity", {
-      value: 42,
+      value: 42n,
       configurable: false,
       enumerable: true,
       writable: true
diff --git a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-configurable.js b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-configurable.js
index 51fd77203b2f7db731a98c057987d7afdca2d3d1..59b5abd4340c235d6ec43ae4959a5b24a398d0f1 100644
--- a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-configurable.js
+++ b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-configurable.js
@@ -23,7 +23,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "0", {
-      value: 42,
+      value: 42n,
       configurable: true,
       enumerable: true,
       writable: true
diff --git a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-not-enumerable.js b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-not-enumerable.js
index 37315f7c98c6e73889b6ac8b6665c3fe47420d3b..4b46693b01e433224579f2de4a63b33d5118ea6d 100644
--- a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-not-enumerable.js
+++ b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-not-enumerable.js
@@ -23,7 +23,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "0", {
-      value: 42,
+      value: 42n,
       configurable: false,
       enumerable: false,
       writable: true
diff --git a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-not-writable.js b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-not-writable.js
index 26f4363fecd5305a1c90ef76392c8b3693b6d91f..8e7bdf4d561c178f38bf8f49c51a82f764154c68 100644
--- a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-not-writable.js
+++ b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-not-writable.js
@@ -23,7 +23,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
 
   assert.sameValue(
     Reflect.defineProperty(sample, "0", {
-      value: 42,
+      value: 42n,
       configurable: false,
       enumerable: true,
       writable: false
diff --git a/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/detached-buffer-realm.js b/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/detached-buffer-realm.js
index f7e71ff0ebdf9e158fbd713cb2bfff9c29e091b0..f5e15d83eb593bb65cddc8f91459a48f6580c010 100644
--- a/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/detached-buffer-realm.js
+++ b/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/detached-buffer-realm.js
@@ -35,6 +35,6 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   $DETACHBUFFER(sample.buffer);
 
   assert.throws(TypeError, function() {
-    sample[0] = 0;
+    sample[0] = 0n;
   });
 });