diff --git a/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js
index 34cf9805355025fb782f9b9683651fede638841a..bdf09e3d1c9755dc4491530ee4069dd53887823d 100755
--- a/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js
@@ -35,3 +35,7 @@ assert.throws(RangeError, function() {
 assert.throws(RangeError, function() {
   dataView.setFloat32(-Infinity, poisoned);
 }, "setFloat32(-Infinity, poisoned)");
+
+assert.throws(RangeError, function() {
+  dataView.setFloat32(Infinity, poisoned);
+}, "setFloat32(Infinity, poisoned)");
diff --git a/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js
index e048fdfa15f7ae124fe1b3e0f1cf47dbe65ab51c..8a1b4013ef59d6a23c177f1ec40fa25a37ab18b7 100755
--- a/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js
@@ -30,18 +30,10 @@ var poisoned = {
   }
 };
 
-assert.throws(Test262Error, function() {
-  dataView.setFloat32(Infinity, poisoned);
-}, "setFloat32(Infinity, poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setFloat32(100, poisoned);
 }, "setFloat32(100, poisoned)");
 
-assert.throws(Test262Error, function() {
-  dataView.setFloat32('Infinity', poisoned);
-}, "setFloat32('Infinity', poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setFloat32('100', poisoned);
 }, "setFloat32('100', poisoned)");
diff --git a/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js
index 5e66803fb73466ca91a8621516e52f8d4dc5e5bb..792e8cc18abe7d2c7701085ef861e0750b32ac4c 100755
--- a/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js
@@ -36,3 +36,7 @@ assert.throws(RangeError, function() {
 assert.throws(RangeError, function() {
   dataView.setFloat64(-Infinity, poisoned);
 }, "setFloat64(-Infinity, poisoned)");
+
+assert.throws(RangeError, function() {
+  dataView.setFloat64(Infinity, poisoned);
+}, "setFloat64(Infinity, poisoned)");
diff --git a/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js
index 5843fdc54cd217e0ac212040b23da2bc9321ac4a..34824077184f94b53f62bba5cacfcb66bedfb726 100755
--- a/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js
@@ -30,18 +30,10 @@ var poisoned = {
   }
 };
 
-assert.throws(Test262Error, function() {
-  dataView.setFloat64(Infinity, poisoned);
-}, "setFloat64(Infinity, poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setFloat64(100, poisoned);
 }, "setFloat64(100, poisoned)");
 
-assert.throws(Test262Error, function() {
-  dataView.setFloat64('Infinity', poisoned);
-}, "setFloat64('Infinity', poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setFloat64('100', poisoned);
 }, "setFloat64('100', poisoned)");
diff --git a/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js
index 826cbc8313132dbf26c56778482342bf13fb1661..7a07fd8e64efcf4964bab759ca1ae1f1b6f553a3 100755
--- a/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js
@@ -36,3 +36,7 @@ assert.throws(RangeError, function() {
 assert.throws(RangeError, function() {
   dataView.setInt16(-Infinity, poisoned);
 }, "setInt16(-Infinity, poisoned)");
+
+assert.throws(RangeError, function() {
+  dataView.setInt16(Infinity, poisoned);
+}, "setInt16(Infinity, poisoned)");
diff --git a/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js
index 7778ab7b7662fa445631aacbdefba121cae4153f..043c2abd24b0a11de19590881d170a54f8be877c 100755
--- a/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js
@@ -30,18 +30,10 @@ var poisoned = {
   }
 };
 
-assert.throws(Test262Error, function() {
-  dataView.setInt16(Infinity, poisoned);
-}, "setInt16(Infinity, poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setInt16(100, poisoned);
 }, "setInt16(100, poisoned)");
 
-assert.throws(Test262Error, function() {
-  dataView.setInt16('Infinity', poisoned);
-}, "setInt16('Infinity', poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setInt16('100', poisoned);
 }, "setInt16('100', poisoned)");
diff --git a/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js
index ee0adecbf3bc3967ef3bd5d15eaa402a386e4af2..8fa67a3a88ee342c00df12ab485a46cbbd5eb13f 100755
--- a/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js
@@ -36,3 +36,7 @@ assert.throws(RangeError, function() {
 assert.throws(RangeError, function() {
   dataView.setInt32(-Infinity, poisoned);
 }, "setInt32(-Infinity, poisoned)");
+
+assert.throws(RangeError, function() {
+  dataView.setInt32(Infinity, poisoned);
+}, "setInt32(Infinity, poisoned)");
diff --git a/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js
index 951de20ba09c4fa56af422af1632db27fd9938dd..a514260a4705cf79acbac21deeae2d4abe2e7c24 100755
--- a/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js
@@ -30,18 +30,10 @@ var poisoned = {
   }
 };
 
-assert.throws(Test262Error, function() {
-  dataView.setInt32(Infinity, poisoned);
-}, "setInt32(Infinity, poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setInt32(100, poisoned);
 }, "setInt32(100, poisoned)");
 
-assert.throws(Test262Error, function() {
-  dataView.setInt32('Infinity', poisoned);
-}, "setInt32('Infinity', poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setInt32('100', poisoned);
 }, "setInt32('100', poisoned)");
diff --git a/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js
index ca6ce0c5a99b734369c26a9559f45b8bea8bf53f..1766d04eb1be05075e180f8e4fb8818d3e3b18dd 100755
--- a/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js
@@ -36,3 +36,7 @@ assert.throws(RangeError, function() {
 assert.throws(RangeError, function() {
   dataView.setInt8(-Infinity, poisoned);
 }, "setInt8(-Infinity, poisoned)");
+
+assert.throws(RangeError, function() {
+  dataView.setInt8(Infinity, poisoned);
+}, "setInt8(Infinity, poisoned)");
diff --git a/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js
index d723d7434149373a092fb04aa1671f9343b40260..a41d72e9a6422ea2f1d0f25d9d180cf678ed8b50 100755
--- a/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js
@@ -30,18 +30,10 @@ var poisoned = {
   }
 };
 
-assert.throws(Test262Error, function() {
-  dataView.setInt8(Infinity, poisoned);
-}, "setInt8(Infinity, poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setInt8(100, poisoned);
 }, "setInt8(100, poisoned)");
 
-assert.throws(Test262Error, function() {
-  dataView.setInt8('Infinity', poisoned);
-}, "setInt8('Infinity', poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setInt8('100', poisoned);
 }, "setInt8('100', poisoned)");
diff --git a/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js
index 6fed3d7b4fd266823d6937d51bc8338decf61b8c..544459a97488c0ad3b66eed685e6e278af3f4d6e 100755
--- a/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js
@@ -36,3 +36,7 @@ assert.throws(RangeError, function() {
 assert.throws(RangeError, function() {
   dataView.setUint16(-Infinity, poisoned);
 }, "setUint16(-Infinity, poisoned)");
+
+assert.throws(RangeError, function() {
+  dataView.setUint16(Infinity, poisoned);
+}, "setUint16(Infinity, poisoned)");
diff --git a/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js
index de7bbbec2c74f95246d166fe829661545ef59483..09a67898c6951371a7fe8cf4126b786427bfbd78 100755
--- a/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js
@@ -30,18 +30,10 @@ var poisoned = {
   }
 };
 
-assert.throws(Test262Error, function() {
-  dataView.setUint16(Infinity, poisoned);
-}, "setUint16(Infinity, poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setUint16(100, poisoned);
 }, "setUint16(100, poisoned)");
 
-assert.throws(Test262Error, function() {
-  dataView.setUint16('Infinity', poisoned);
-}, "setUint16('Infinity', poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setUint16('100', poisoned);
 }, "setUint16('100', poisoned)");
diff --git a/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js
index 7bbab801d30b7b08a56bc87d881757ab96430fc3..115b9a4b49b5a694d79e9b623341624681a95217 100755
--- a/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js
@@ -36,3 +36,7 @@ assert.throws(RangeError, function() {
 assert.throws(RangeError, function() {
   dataView.setUint32(-Infinity, poisoned);
 }, "setUint32(-Infinity, poisoned)");
+
+assert.throws(RangeError, function() {
+  dataView.setUint32(Infinity, poisoned);
+}, "setUint32(Infinity, poisoned)");
diff --git a/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js
index be32633578f44527cef2244228aac97e3482467b..03155eacddedb9f0136ddfaea6dba583b1da6a7a 100755
--- a/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js
@@ -30,18 +30,10 @@ var poisoned = {
   }
 };
 
-assert.throws(Test262Error, function() {
-  dataView.setUint32(Infinity, poisoned);
-}, "setUint32(Infinity, poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setUint32(100, poisoned);
 }, "setUint32(100, poisoned)");
 
-assert.throws(Test262Error, function() {
-  dataView.setUint32('Infinity', poisoned);
-}, "setUint32('Infinity', poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setUint32('100', poisoned);
 }, "setUint32('100', poisoned)");
diff --git a/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js
index d1a93d452b230c057bf0109c0a88711ab72cd162..34690136ee482d6341c8894bddb7c09426831ad1 100755
--- a/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js
@@ -36,3 +36,7 @@ assert.throws(RangeError, function() {
 assert.throws(RangeError, function() {
   dataView.setUint8(-Infinity, poisoned);
 }, "setUint8(-Infinity, poisoned)");
+
+assert.throws(RangeError, function() {
+  dataView.setUint8(Infinity, poisoned);
+}, "setUint8(Infinity, poisoned)");
diff --git a/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js
index c22efa0bf1688b45634f2cbde8d5154807e3446a..d377b99e0f4057cbab2cd171b87e649ee8582911 100755
--- a/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js
@@ -30,18 +30,10 @@ var poisoned = {
   }
 };
 
-assert.throws(Test262Error, function() {
-  dataView.setUint8(Infinity, poisoned);
-}, "setUint8(Infinity, poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setUint8(100, poisoned);
 }, "setUint8(100, poisoned)");
 
-assert.throws(Test262Error, function() {
-  dataView.setUint8('Infinity', poisoned);
-}, "setUint8('Infinity', poisoned)");
-
 assert.throws(Test262Error, function() {
   dataView.setUint8('100', poisoned);
 }, "setUint8('100', poisoned)");