diff --git a/test/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-diff-buffer-other-type.js b/test/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-diff-buffer-other-type.js
index 4ba857e0309bfdcc7d8cf95e547524c0aa1579d7..04ddb52371f3d9e47d82985b3822ce1dc2405434 100644
--- a/test/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-diff-buffer-other-type.js
+++ b/test/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-diff-buffer-other-type.js
@@ -28,9 +28,6 @@ features: [TypedArray]
 
 testWithTypedArrayConstructors(function(TA) {
   var other = TA === Float32Array ? Float64Array : Float32Array;
-  if (typeof BigInt !== "undefined")
-    other = TA === BigInt64Array ? BigUint64Array :
-            TA === BigUint64Array ? BigInt64Array : other;
   var src = new other([42, 43]);
   var sample, result;
 
diff --git a/test/built-ins/TypedArray/prototype/set/typedarray-arg-src-byteoffset-internal.js b/test/built-ins/TypedArray/prototype/set/typedarray-arg-src-byteoffset-internal.js
index 498ac5fc844b572e0ee5e05d5bbcf48fceaf0302..c3bfdeb28e9d997cbc94ac27314b09d5c2ef4351 100644
--- a/test/built-ins/TypedArray/prototype/set/typedarray-arg-src-byteoffset-internal.js
+++ b/test/built-ins/TypedArray/prototype/set/typedarray-arg-src-byteoffset-internal.js
@@ -29,9 +29,6 @@ testWithTypedArrayConstructors(function(TA) {
   var sample = new TA(2);
   var src = new TA([42, 43]);
   var differentTA = TA === Uint8Array ? Int8Array : Uint8Array;
-  if (typeof BigInt !== "undefined")
-    differentTA = TA === BigInt64Array ? BigUint64Array :
-                  TA === BigUint64Array ? BigInt64Array : differentTA;
   var src2 = new differentTA([42, 43]);
   var src3 = new differentTA(sample.buffer, 0, 2);
 
diff --git a/test/built-ins/TypedArray/prototype/set/typedarray-arg-target-byteoffset-internal.js b/test/built-ins/TypedArray/prototype/set/typedarray-arg-target-byteoffset-internal.js
index ac5b8f6cb9c9dcd21cb4be8e83371fdbdb3dbc16..9e2802617a21b9cf5308136f782931e0f904aa10 100644
--- a/test/built-ins/TypedArray/prototype/set/typedarray-arg-target-byteoffset-internal.js
+++ b/test/built-ins/TypedArray/prototype/set/typedarray-arg-target-byteoffset-internal.js
@@ -30,9 +30,6 @@ testWithTypedArrayConstructors(function(TA) {
   var sample = new TA(2);
   var src = new TA([42, 43]);
   var differentTA = TA === Uint8Array ? Int8Array : Uint8Array;
-  if (typeof BigInt !== "undefined")
-    differentTA = TA === BigInt64Array ? BigUint64Array :
-                  TA === BigUint64Array ? BigInt64Array : differentTA;
   var src2 = new differentTA([42, 43]);
   var src3 = new differentTA(sample.buffer, 0, 2);
 
diff --git a/test/built-ins/TypedArray/prototype/slice/set-values-from-different-ctor-type.js b/test/built-ins/TypedArray/prototype/slice/set-values-from-different-ctor-type.js
index c0195b705ba29dfe382910353551aec4a532aeac..cb19d311d2c74b056ef5d3e0887afa867bf58666 100644
--- a/test/built-ins/TypedArray/prototype/slice/set-values-from-different-ctor-type.js
+++ b/test/built-ins/TypedArray/prototype/slice/set-values-from-different-ctor-type.js
@@ -35,9 +35,6 @@ var arr = [42, 43, 44];
 testWithTypedArrayConstructors(function(TA) {
   var sample = new TA(arr);
   var other = TA === Int8Array ? Uint8Array : Int8Array;
-  if (typeof BigInt !== "undefined") {
-    other = TA === BigInt64Array ? BigUint64Array :
-            TA === BigUint64Array ? BigInt64Array : other;
 
   sample.constructor = {};
   sample.constructor[Symbol.species] = other;
diff --git a/test/built-ins/TypedArray/prototype/toLocaleString/calls-tolocalestring-from-each-value.js b/test/built-ins/TypedArray/prototype/toLocaleString/calls-tolocalestring-from-each-value.js
index ba9b112478d2cae22310193056eeba713e294724..980670c721cfa7e261ed16b36d9bfdc96d156008 100644
--- a/test/built-ins/TypedArray/prototype/toLocaleString/calls-tolocalestring-from-each-value.js
+++ b/test/built-ins/TypedArray/prototype/toLocaleString/calls-tolocalestring-from-each-value.js
@@ -39,10 +39,6 @@ Number.prototype.toLocaleString = function() {
   return "hacks" + calls.length;
 };
 
-if (typeof BigInt !== "undefined") {
-  BigInt.prototype.toLocaleString = Number.prototype.toLocaleString;
-}
-
 var arr = [42, 0];
 var expected = ["hacks1", "hacks2"].join(separator);
 
diff --git a/test/built-ins/TypedArray/prototype/toLocaleString/calls-tostring-from-each-value.js b/test/built-ins/TypedArray/prototype/toLocaleString/calls-tostring-from-each-value.js
index befe997163b00a7ef507d420cda4735a9772f972..530ec105574c331264a3158e408c9ea74d8c06c4 100644
--- a/test/built-ins/TypedArray/prototype/toLocaleString/calls-tostring-from-each-value.js
+++ b/test/built-ins/TypedArray/prototype/toLocaleString/calls-tostring-from-each-value.js
@@ -47,10 +47,6 @@ Number.prototype.toLocaleString = function() {
   };
 };
 
-if (typeof BigInt !== "undefined") {
-  BigInt.prototype.toLocaleString = Number.prototype.toLocaleString;
-}
-
 var arr = [42, 0];
 var expected = ["hacks1", "hacks2"].join(separator);
 
diff --git a/test/built-ins/TypedArray/prototype/toLocaleString/calls-valueof-from-each-value.js b/test/built-ins/TypedArray/prototype/toLocaleString/calls-valueof-from-each-value.js
index 728aaf239ebb5a12f714d2269efe58728291a61e..328bbbf4e6bbc1a6f0ecf73145d7f7bcccf8e117 100644
--- a/test/built-ins/TypedArray/prototype/toLocaleString/calls-valueof-from-each-value.js
+++ b/test/built-ins/TypedArray/prototype/toLocaleString/calls-valueof-from-each-value.js
@@ -45,10 +45,6 @@ Number.prototype.toLocaleString = function() {
   };
 };
 
-if (typeof BigInt !== "undefined") {
-  BigInt.prototype.toLocaleString = Number.prototype.toLocaleString;
-}
-
 var arr = [42, 0];
 var expected = ["hacks1", "hacks2"].join(separator);
 
diff --git a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-tolocalestring.js b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-tolocalestring.js
index 7f31b9c3317197fa878200fdbefec2a6b276356c..d934b70da48c03f6e748be489bc46d199e2c4c7b 100644
--- a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-tolocalestring.js
+++ b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-tolocalestring.js
@@ -31,10 +31,6 @@ Number.prototype.toLocaleString = function() {
   throw new Test262Error();
 };
 
-if (typeof BigInt !== "undefined") {
-  BigInt.prototype.toLocaleString = Number.prototype.toLocaleString;
-}
-
 var arr = [42, 0];
 
 testWithTypedArrayConstructors(function(TA, N) {
diff --git a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-tostring.js b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-tostring.js
index 6abe3565db467660c83028370ebcf1f8b72a6d68..394105ef3aa7841fe6af3d90f34283cd8aaf725f 100644
--- a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-tostring.js
+++ b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-tostring.js
@@ -43,10 +43,6 @@ Number.prototype.toLocaleString = function() {
   };
 };
 
-if (typeof BigInt !== "undefined") {
-  BigInt.prototype.toLocaleString = Number.prototype.toLocaleString;
-}
-
 var arr = [42, 0];
 
 testWithTypedArrayConstructors(function(TA, N) {
diff --git a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-valueof.js b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-valueof.js
index 424ec3a32914d84c56608594b9f9973db9f70d02..ae7e4169e2261a77a990876f7bddf8a47f7ec9cd 100644
--- a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-valueof.js
+++ b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-firstelement-valueof.js
@@ -44,10 +44,6 @@ Number.prototype.toLocaleString = function() {
   };
 };
 
-if (typeof BigInt !== "undefined") {
-  BigInt.prototype.toLocaleString = Number.prototype.toLocaleString;
-}
-
 var arr = [42, 0];
 
 testWithTypedArrayConstructors(function(TA, N) {
diff --git a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-tolocalestring.js b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-tolocalestring.js
index 18e315c06b9bf6a39b6a6fe13fdf3268b94d6f93..49e02d09a4e89e10b2efc06cbd725cc59c9ee8f8 100644
--- a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-tolocalestring.js
+++ b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-tolocalestring.js
@@ -34,10 +34,6 @@ Number.prototype.toLocaleString = function() {
   }
 };
 
-if (typeof BigInt !== "undefined") {
-  BigInt.prototype.toLocaleString = Number.prototype.toLocaleString;
-}
-
 var arr = [42, 0];
 
 testWithTypedArrayConstructors(function(TA, N) {
diff --git a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-tostring.js b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-tostring.js
index 6bfca767bf8dea67b6ba4ae5934d442cf53677c6..d872475c79ae8802072eb6e97555526880a870f4 100644
--- a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-tostring.js
+++ b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-tostring.js
@@ -45,10 +45,6 @@ Number.prototype.toLocaleString = function() {
   };
 };
 
-if (typeof BigInt !== "undefined") {
-  BigInt.prototype.toLocaleString = Number.prototype.toLocaleString;
-}
-
 var arr = [42, 0];
 
 testWithTypedArrayConstructors(function(TA, N) {
diff --git a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-valueof.js b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-valueof.js
index 0992a98485f900409ff7cf41f49f1a05db964652..7df9a09d4fe60b85561b6d0a07a8dd5383d7688a 100644
--- a/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-valueof.js
+++ b/test/built-ins/TypedArray/prototype/toLocaleString/return-abrupt-from-nextelement-valueof.js
@@ -46,10 +46,6 @@ Number.prototype.toLocaleString = function() {
   };
 };
 
-if (typeof BigInt !== "undefined") {
-  BigInt.prototype.toLocaleString = Number.prototype.toLocaleString;
-}
-
 var arr = [42, 0];
 
 testWithTypedArrayConstructors(function(TA, N) {