diff --git a/tests/baselines/reference/staticAsIdentifier.errors.txt b/tests/baselines/reference/staticAsIdentifier.errors.txt
index 52108a5a2214b..c4d6ea7d0fd76 100644
--- a/tests/baselines/reference/staticAsIdentifier.errors.txt
+++ b/tests/baselines/reference/staticAsIdentifier.errors.txt
@@ -7,4 +7,8 @@ tests/cases/compiler/staticAsIdentifier.ts(2,12): error TS1030: 'static' modifie
                ~~~~~~
 !!! error TS1030: 'static' modifier already seen.
         [x: string]: string;
+    }
+    
+    class CC {
+        static static;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/staticAsIdentifier.js b/tests/baselines/reference/staticAsIdentifier.js
index d04fd375be5d0..a4dcd070ea886 100644
--- a/tests/baselines/reference/staticAsIdentifier.js
+++ b/tests/baselines/reference/staticAsIdentifier.js
@@ -2,6 +2,10 @@
 class C {
     static static
     [x: string]: string;
+}
+
+class CC {
+    static static;
 }
 
 //// [staticAsIdentifier.js]
@@ -10,3 +14,8 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
+var CC = /** @class */ (function () {
+    function CC() {
+    }
+    return CC;
+}());
diff --git a/tests/baselines/reference/staticAsIdentifier.symbols b/tests/baselines/reference/staticAsIdentifier.symbols
index c5f37ddd1f80a..ec2e7a478ac18 100644
--- a/tests/baselines/reference/staticAsIdentifier.symbols
+++ b/tests/baselines/reference/staticAsIdentifier.symbols
@@ -6,3 +6,10 @@ class C {
     [x: string]: string;
 >x : Symbol(x, Decl(staticAsIdentifier.ts, 2, 5))
 }
+
+class CC {
+>CC : Symbol(CC, Decl(staticAsIdentifier.ts, 3, 1))
+
+    static static;
+>static : Symbol(CC.static, Decl(staticAsIdentifier.ts, 5, 10))
+}
diff --git a/tests/baselines/reference/staticAsIdentifier.types b/tests/baselines/reference/staticAsIdentifier.types
index 05608dce146b1..786fc4a77b0f7 100644
--- a/tests/baselines/reference/staticAsIdentifier.types
+++ b/tests/baselines/reference/staticAsIdentifier.types
@@ -6,3 +6,10 @@ class C {
     [x: string]: string;
 >x : string
 }
+
+class CC {
+>CC : CC
+
+    static static;
+>static : any
+}
diff --git a/tests/baselines/reference/staticIndexer.js b/tests/baselines/reference/staticIndexer.js
deleted file mode 100644
index 26a0511c543ec..0000000000000
--- a/tests/baselines/reference/staticIndexer.js
+++ /dev/null
@@ -1,11 +0,0 @@
-//// [staticIndexer.ts]
-class C {
-    static [s: string]: number;
-}
-
-//// [staticIndexer.js]
-var C = /** @class */ (function () {
-    function C() {
-    }
-    return C;
-}());
diff --git a/tests/baselines/reference/staticIndexer.symbols b/tests/baselines/reference/staticIndexer.symbols
deleted file mode 100644
index 8bd2376edd72d..0000000000000
--- a/tests/baselines/reference/staticIndexer.symbols
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/compiler/staticIndexer.ts ===
-class C {
->C : Symbol(C, Decl(staticIndexer.ts, 0, 0))
-
-    static [s: string]: number;
->s : Symbol(s, Decl(staticIndexer.ts, 1, 12))
-}
diff --git a/tests/baselines/reference/staticIndexer.types b/tests/baselines/reference/staticIndexer.types
deleted file mode 100644
index 4e1a3799e59fa..0000000000000
--- a/tests/baselines/reference/staticIndexer.types
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/compiler/staticIndexer.ts ===
-class C {
->C : C
-
-    static [s: string]: number;
->s : string
-}
diff --git a/tests/cases/compiler/staticAsIdentifier.ts b/tests/cases/compiler/staticAsIdentifier.ts
index 3cccca3bf8874..f6e97e6ab94ff 100644
--- a/tests/cases/compiler/staticAsIdentifier.ts
+++ b/tests/cases/compiler/staticAsIdentifier.ts
@@ -1,4 +1,8 @@
 class C {
     static static
     [x: string]: string;
+}
+
+class CC {
+    static static;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/staticIndexer.ts b/tests/cases/compiler/staticIndexer.ts
deleted file mode 100644
index 4a73ed9c40a3f..0000000000000
--- a/tests/cases/compiler/staticIndexer.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-class C {
-    static [s: string]: number;
-}
\ No newline at end of file