diff --git a/test/built-ins/Infinity/15.1.1.2-0.js b/test/built-ins/Infinity/15.1.1.2-0.js
index a2e63985e2478a8a12bfa3d4eff5fdff85d474fc..4c713b5919b0afefd48eb21425377e6bcc52fdf7 100644
--- a/test/built-ins/Infinity/15.1.1.2-0.js
+++ b/test/built-ins/Infinity/15.1.1.2-0.js
@@ -8,7 +8,7 @@ description: >
     (false)
 ---*/
 
-    var desc = Object.getOwnPropertyDescriptor(this, 'Infinity');
+var desc = Object.getOwnPropertyDescriptor(this, 'Infinity');
 
 assert.sameValue(desc.writable, false, 'desc.writable');
 assert.sameValue(desc.enumerable, false, 'desc.enumerable');
diff --git a/test/built-ins/Infinity/S15.1.1.2_A1.js b/test/built-ins/Infinity/S15.1.1.2_A1.js
index 063168d55f8fa7472a2b965b9dc6957391a3e30c..5895191bd04cd76bd2330b358a4449a3ceb7856b 100644
--- a/test/built-ins/Infinity/S15.1.1.2_A1.js
+++ b/test/built-ins/Infinity/S15.1.1.2_A1.js
@@ -9,21 +9,21 @@ description: Use typeof, isNaN, isFinite
 
 // CHECK#1
 if (typeof(Infinity) !== "number") {
-	$ERROR('#1: typeof(Infinity) === "number". Actual: ' + (typeof(Infinity))); 
+  $ERROR('#1: typeof(Infinity) === "number". Actual: ' + (typeof(Infinity)));
 }
 
 // CHECK#2
 if (isFinite(Infinity) !== false) {
-	$ERROR('#2: Infinity === Not-a-Finite. Actual: ' + (Infinity)); 
+  $ERROR('#2: Infinity === Not-a-Finite. Actual: ' + (Infinity));
 }
 
 // CHECK#3
 if (isNaN(Infinity) !== false) {
-	$ERROR('#3: Infinity === Not-a-Number. Actual: ' + (Infinity)); 
+  $ERROR('#3: Infinity === Not-a-Number. Actual: ' + (Infinity));
 }
 
 
 // CHECK#4
 if (Infinity !== Number.POSITIVE_INFINITY) {
-	$ERROR('#4: Infinity === Number.POSITIVE_INFINITY. Actual: ' + (Infinity)); 
+  $ERROR('#4: Infinity === Number.POSITIVE_INFINITY. Actual: ' + (Infinity));
 }
diff --git a/test/built-ins/Infinity/S15.1.1.2_A2_T1.js b/test/built-ins/Infinity/S15.1.1.2_A2_T1.js
index 0a6435466340d51cc50059889cfa539b1662ae81..1575771b246b39e0b129274164ac90e73f43ffac 100644
--- a/test/built-ins/Infinity/S15.1.1.2_A2_T1.js
+++ b/test/built-ins/Infinity/S15.1.1.2_A2_T1.js
@@ -11,5 +11,5 @@ includes: [propertyHelper.js]
 // CHECK#1
 verifyNotWritable(this, "Infinity", null, true);
 if (typeof(Infinity) === "boolean") {
-	$ERROR('#1: Infinity = true; typeof(Infinity) !== "boolean". Actual: ' + (typeof(Infinity)));
+  $ERROR('#1: Infinity = true; typeof(Infinity) !== "boolean". Actual: ' + (typeof(Infinity)));
 }
diff --git a/test/built-ins/Infinity/S15.1.1.2_A2_T2.js b/test/built-ins/Infinity/S15.1.1.2_A2_T2.js
index d6c4093870169e5337636e6c4c123c5f65106989..ea99c3061f880fc5e60d36a52e8c4642cd223670 100644
--- a/test/built-ins/Infinity/S15.1.1.2_A2_T2.js
+++ b/test/built-ins/Infinity/S15.1.1.2_A2_T2.js
@@ -11,5 +11,5 @@ flags: [noStrict]
 // CHECK#1
 Infinity = true;
 if (typeof(Infinity) === "boolean") {
-	$ERROR('#1: Infinity = true; typeof(Infinity) !== "boolean". Actual: ' + (typeof(Infinity)));
+  $ERROR('#1: Infinity = true; typeof(Infinity) !== "boolean". Actual: ' + (typeof(Infinity)));
 }
diff --git a/test/built-ins/Infinity/S15.1.1.2_A3_T2.js b/test/built-ins/Infinity/S15.1.1.2_A3_T2.js
index 8e8433f4dd421bb391b0d4f4088486fb93061754..09b1a7467816ec405cad27a8b26dc911330b8868 100644
--- a/test/built-ins/Infinity/S15.1.1.2_A3_T2.js
+++ b/test/built-ins/Infinity/S15.1.1.2_A3_T2.js
@@ -10,5 +10,5 @@ flags: [noStrict]
 
 // CHECK#1
 if (delete Infinity !== false) {
-	$ERROR('#1: delete Infinity === false. Actual: ' + (delete Infinity));
+  $ERROR('#1: delete Infinity === false. Actual: ' + (delete Infinity));
 }
diff --git a/test/built-ins/Infinity/S15.1.1.2_A4.js b/test/built-ins/Infinity/S15.1.1.2_A4.js
index fe9c76f6d16dcb796b16a36dd9d5c72f73559187..73dadfecc70a4eeb1380661f1222747fcc7ee979 100644
--- a/test/built-ins/Infinity/S15.1.1.2_A4.js
+++ b/test/built-ins/Infinity/S15.1.1.2_A4.js
@@ -10,6 +10,6 @@ description: Use for-in statement
 // CHECK#1
 for (var prop in this) {
   if (prop === "Infinity") {
-	$ERROR('#1: The Infinity is DontEnum');
+    $ERROR('#1: The Infinity is DontEnum');
   }
 }
diff --git a/test/built-ins/NaN/15.1.1.1-0.js b/test/built-ins/NaN/15.1.1.1-0.js
index c8638ede8c0322fd43eba71b225cfba787b69589..f775484dbd605dfc45e4a6f03e5099d6f6c10acd 100644
--- a/test/built-ins/NaN/15.1.1.1-0.js
+++ b/test/built-ins/NaN/15.1.1.1-0.js
@@ -6,7 +6,7 @@ es5id: 15.1.1.1-0
 description: Global.NaN is a data property with default attribute values (false)
 ---*/
 
-    var desc = Object.getOwnPropertyDescriptor(this, 'NaN');
+var desc = Object.getOwnPropertyDescriptor(this, 'NaN');
 
 assert.sameValue(desc.writable, false, 'desc.writable');
 assert.sameValue(desc.enumerable, false, 'desc.enumerable');
diff --git a/test/built-ins/NaN/S15.1.1.1_A2_T1.js b/test/built-ins/NaN/S15.1.1.1_A2_T1.js
index 2ed88aa61e127f2b1392b7a8d8604519031fc8f0..0fe23aa65e16568cbeda089315ff8c5500a5dd5d 100644
--- a/test/built-ins/NaN/S15.1.1.1_A2_T1.js
+++ b/test/built-ins/NaN/S15.1.1.1_A2_T1.js
@@ -11,5 +11,5 @@ includes: [propertyHelper.js]
 // CHECK#1
 verifyNotWritable(this, "NaN", null, true);
 if (typeof(NaN) === "boolean") {
-	$ERROR('#1: NaN = true; typeof(NaN) !== "boolean". Actual: ' + (typeof(NaN)));
+  $ERROR('#1: NaN = true; typeof(NaN) !== "boolean". Actual: ' + (typeof(NaN)));
 }
diff --git a/test/built-ins/NaN/S15.1.1.1_A2_T2.js b/test/built-ins/NaN/S15.1.1.1_A2_T2.js
index e357fbe37032004fd7f7f1f82d1a2f34382f661e..f2654376c9fe6d23c05dac95f69de41fa74ebe8f 100644
--- a/test/built-ins/NaN/S15.1.1.1_A2_T2.js
+++ b/test/built-ins/NaN/S15.1.1.1_A2_T2.js
@@ -11,5 +11,5 @@ flags: [noStrict]
 // CHECK#1
 NaN = true;
 if (typeof(NaN) === "boolean") {
-	$ERROR('#1: NaN = true; typeof(NaN) !== "boolean". Actual: ' + (typeof(NaN)));
+  $ERROR('#1: NaN = true; typeof(NaN) !== "boolean". Actual: ' + (typeof(NaN)));
 }
diff --git a/test/built-ins/NaN/S15.1.1.1_A3_T2.js b/test/built-ins/NaN/S15.1.1.1_A3_T2.js
index c9e072c4b4c0f3385e5ee30d0c7422cc36b310ee..475c1eb9b5ee7664ec98f41cebada7f9fd6db2be 100644
--- a/test/built-ins/NaN/S15.1.1.1_A3_T2.js
+++ b/test/built-ins/NaN/S15.1.1.1_A3_T2.js
@@ -10,5 +10,5 @@ flags: [noStrict]
 
 // CHECK#1
 if (delete NaN !== false) {
-	$ERROR('#1: delete NaN === false. Actual: ' + (delete NaN));
+  $ERROR('#1: delete NaN === false. Actual: ' + (delete NaN));
 }
diff --git a/test/built-ins/NaN/S15.1.1.1_A4.js b/test/built-ins/NaN/S15.1.1.1_A4.js
index 797f524381c04159b2b432f6e73dcf40fd953bdd..a4ec30485715bee6750794c2ce73a1d6af40d6d2 100644
--- a/test/built-ins/NaN/S15.1.1.1_A4.js
+++ b/test/built-ins/NaN/S15.1.1.1_A4.js
@@ -10,6 +10,6 @@ description: Use for-in statement
 // CHECK#1
 for (var prop in this) {
   if (prop === "NaN") {
-	$ERROR('#1: The NaN is DontEnum');
+    $ERROR('#1: The NaN is DontEnum');
   }
 }
diff --git a/test/built-ins/undefined/15.1.1.3-2.js b/test/built-ins/undefined/15.1.1.3-2.js
index 2c3a243086c371e3dcc065e06da919e01803ca71..78ab60a7656e7f680ac65ff7217edb5184ca77d8 100644
--- a/test/built-ins/undefined/15.1.1.3-2.js
+++ b/test/built-ins/undefined/15.1.1.3-2.js
@@ -12,7 +12,7 @@ flags: [onlyStrict]
 var global = this;
 
 assert.throws(TypeError, function() {
-  global["undefined"] = 5;  // Should throw a TypeError as per 8.12.5
+  global["undefined"] = 5; // Should throw a TypeError as per 8.12.5
 });
 assert.sameValue(global["undefined"], void 0);
 assert.sameValue(undefined, void 0);
diff --git a/test/built-ins/undefined/S15.1.1.3_A1.js b/test/built-ins/undefined/S15.1.1.3_A1.js
index 5f13f195f25d406bd405004a42c411293dba2ec9..c5159d7e1362559d45bf56b74696736f2e97d8af 100644
--- a/test/built-ins/undefined/S15.1.1.3_A1.js
+++ b/test/built-ins/undefined/S15.1.1.3_A1.js
@@ -11,15 +11,15 @@ description: Use typeof, isNaN, isFinite
 
 // CHECK#1
 if (typeof(undefined) !== "undefined") {
-	$ERROR('#1: typeof(undefined) === "undefined". Actual: ' + (typeof(undefined)));
+  $ERROR('#1: typeof(undefined) === "undefined". Actual: ' + (typeof(undefined)));
 }
 
 // CHECK#2
 if (undefined !== void 0) {
-	$ERROR('#2: undefined === void 0. Actual: ' + (undefined));
+  $ERROR('#2: undefined === void 0. Actual: ' + (undefined));
 }
 
 // CHECK#3
 if (undefined !== eval("var x")) {
-	$ERROR('#3: undefined === eval("var x"). Actual: ' + (undefined));
+  $ERROR('#3: undefined === eval("var x"). Actual: ' + (undefined));
 }
diff --git a/test/built-ins/undefined/S15.1.1.3_A3_T2.js b/test/built-ins/undefined/S15.1.1.3_A3_T2.js
index d5774708806b0b2272b5f17eb1891786f5a25336..12282235e4c88ea67f0c5a74a64e94bc4629a6f0 100644
--- a/test/built-ins/undefined/S15.1.1.3_A3_T2.js
+++ b/test/built-ins/undefined/S15.1.1.3_A3_T2.js
@@ -12,5 +12,5 @@ flags: [noStrict]
 
 // CHECK#1
 if (delete undefined !== false) {
-	$ERROR('#1: delete undefined === false. Actual: ' + (delete undefined));
+  $ERROR('#1: delete undefined === false. Actual: ' + (delete undefined));
 }
diff --git a/test/built-ins/undefined/S15.1.1.3_A4.js b/test/built-ins/undefined/S15.1.1.3_A4.js
index f49d5ca8c79e8634de34e7191a1765167415a343..49918799e9bec7795f2577d46984aa5a3d7a2a69 100644
--- a/test/built-ins/undefined/S15.1.1.3_A4.js
+++ b/test/built-ins/undefined/S15.1.1.3_A4.js
@@ -12,6 +12,6 @@ description: Use for-in statement
 // CHECK#1
 for (var prop in this) {
   if (prop === "undefined") {
-	  $ERROR('#1: The undefined is DontEnum');
+    $ERROR('#1: The undefined is DontEnum');
   }
 }