diff --git a/tests/baselines/reference/for-of58.js b/tests/baselines/reference/ES5for-of32.js
similarity index 85%
rename from tests/baselines/reference/for-of58.js
rename to tests/baselines/reference/ES5for-of32.js
index 6f738a59142..7af7cc3874a 100644
--- a/tests/baselines/reference/for-of58.js
+++ b/tests/baselines/reference/ES5for-of32.js
@@ -1,4 +1,4 @@
-//// [for-of58.ts]
+//// [ES5for-of32.ts]
 
 var array = [1,2,3];
 var sum = 0;
@@ -11,7 +11,7 @@ for (let num of array) {
     sum += num;
 }
 
-//// [for-of58.js]
+//// [ES5for-of32.js]
 var array = [1, 2, 3];
 var sum = 0;
 for (var _i = 0, array_1 = array; _i < array_1.length; _i++) {
diff --git a/tests/baselines/reference/ES5for-of32.symbols b/tests/baselines/reference/ES5for-of32.symbols
new file mode 100644
index 00000000000..5672ad01109
--- /dev/null
+++ b/tests/baselines/reference/ES5for-of32.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/conformance/statements/for-ofStatements/ES5for-of32.ts ===
+
+var array = [1,2,3];
+>array : Symbol(array, Decl(ES5for-of32.ts, 1, 3))
+
+var sum = 0;
+>sum : Symbol(sum, Decl(ES5for-of32.ts, 2, 3))
+
+for (let num of array) {
+>num : Symbol(num, Decl(ES5for-of32.ts, 4, 8))
+>array : Symbol(array, Decl(ES5for-of32.ts, 1, 3))
+
+    if (sum === 0) {
+>sum : Symbol(sum, Decl(ES5for-of32.ts, 2, 3))
+
+        array = [4,5,6]
+>array : Symbol(array, Decl(ES5for-of32.ts, 1, 3))
+    }
+    
+    sum += num;
+>sum : Symbol(sum, Decl(ES5for-of32.ts, 2, 3))
+>num : Symbol(num, Decl(ES5for-of32.ts, 4, 8))
+}
diff --git a/tests/baselines/reference/for-of58.types b/tests/baselines/reference/ES5for-of32.types
similarity index 80%
rename from tests/baselines/reference/for-of58.types
rename to tests/baselines/reference/ES5for-of32.types
index b82fdfd8483..6fe5ba2008b 100644
--- a/tests/baselines/reference/for-of58.types
+++ b/tests/baselines/reference/ES5for-of32.types
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/for-ofStatements/for-of58.ts ===
+=== tests/cases/conformance/statements/for-ofStatements/ES5for-of32.ts ===
 
 var array = [1,2,3];
 >array : number[]
diff --git a/tests/baselines/reference/for-of58.symbols b/tests/baselines/reference/for-of58.symbols
deleted file mode 100644
index cb7fa87e22d..00000000000
--- a/tests/baselines/reference/for-of58.symbols
+++ /dev/null
@@ -1,23 +0,0 @@
-=== tests/cases/conformance/es6/for-ofStatements/for-of58.ts ===
-
-var array = [1,2,3];
->array : Symbol(array, Decl(for-of58.ts, 1, 3))
-
-var sum = 0;
->sum : Symbol(sum, Decl(for-of58.ts, 2, 3))
-
-for (let num of array) {
->num : Symbol(num, Decl(for-of58.ts, 4, 8))
->array : Symbol(array, Decl(for-of58.ts, 1, 3))
-
-    if (sum === 0) {
->sum : Symbol(sum, Decl(for-of58.ts, 2, 3))
-
-        array = [4,5,6]
->array : Symbol(array, Decl(for-of58.ts, 1, 3))
-    }
-    
-    sum += num;
->sum : Symbol(sum, Decl(for-of58.ts, 2, 3))
->num : Symbol(num, Decl(for-of58.ts, 4, 8))
-}