diff --git a/runtime/indent/testdir/vim.in b/runtime/indent/testdir/vim.in
index a3c8c920bf..ae52f3a947 100644
--- a/runtime/indent/testdir/vim.in
+++ b/runtime/indent/testdir/vim.in
@@ -905,15 +905,15 @@ endif
 
 " START_INDENT
 abstract class Shape
-this.color = Color.Black
-this.thickness = 10
+var color = Color.Black
+var thickness = 10
 endclass
 " END_INDENT
 
 " START_INDENT
 class OtherThing
-this.size: number
-static totalSize: number
+var size: number
+static var totalSize: number
 
 static def ClearTotalSize(): number
 var prev = totalSize
@@ -925,7 +925,7 @@ endclass
 
 " START_INDENT
 interface HasSurface
-this.size: number
+var size: number
 def Surface(): number
 endinterface
 " END_INDENT
@@ -939,10 +939,10 @@ endinterface
 
 " START_INDENT
 enum Color
-White
-Red
-Green
-Blue
+White,
+Red,
+Green,
+Blue,
 Black
 endenum
 " END_INDENT
diff --git a/runtime/indent/testdir/vim.ok b/runtime/indent/testdir/vim.ok
index 56f3d98ba0..2ab4f39c0c 100644
--- a/runtime/indent/testdir/vim.ok
+++ b/runtime/indent/testdir/vim.ok
@@ -905,15 +905,15 @@ endif
 
 " START_INDENT
 abstract class Shape
-    this.color = Color.Black
-    this.thickness = 10
+    var color = Color.Black
+    var thickness = 10
 endclass
 " END_INDENT
 
 " START_INDENT
 class OtherThing
-    this.size: number
-    static totalSize: number
+    var size: number
+    static var totalSize: number
 
     static def ClearTotalSize(): number
 	var prev = totalSize
@@ -925,7 +925,7 @@ endclass
 
 " START_INDENT
 interface HasSurface
-    this.size: number
+    var size: number
     def Surface(): number
 endinterface
 " END_INDENT
@@ -939,11 +939,11 @@ endinterface
 
 " START_INDENT
 enum Color
-    White
-    Red
-    Green
-    Blue
-    Black
+    White,
+	Red,
+	Green,
+	Blue,
+	Black
 endenum
 " END_INDENT