diff --git a/tests/cases/fourslash/docCommentScaffoldingEmptyFile.ts b/tests/cases/fourslash/docCommentScaffoldingEmptyFile.ts
index 733c7673579..35d427a0001 100644
--- a/tests/cases/fourslash/docCommentScaffoldingEmptyFile.ts
+++ b/tests/cases/fourslash/docCommentScaffoldingEmptyFile.ts
@@ -3,4 +3,5 @@
 // @Filename: emptyFile.ts
 /////*0*/
 
-verify.DocCommentScaffolding("/** */", 3);
\ No newline at end of file
+goTo.marker("0");
+verify.noDocCommentScaffolding();
\ No newline at end of file
diff --git a/tests/cases/fourslash/docCommentScaffoldingFunctionWithParameters.ts b/tests/cases/fourslash/docCommentScaffoldingFunctionWithParameters.ts
index 11eb8495fe7..d127f60f47e 100644
--- a/tests/cases/fourslash/docCommentScaffoldingFunctionWithParameters.ts
+++ b/tests/cases/fourslash/docCommentScaffoldingFunctionWithParameters.ts
@@ -1,11 +1,17 @@
 /// <reference path='fourslash.ts' />
 
-// @Filename: emptyFile.ts
+// @Filename: functionWithParams.ts
 /////*0*/
 ////    /*1*/
 ////        function foo(x: number, y: string): boolean {}
 
-const noIndentEmptyScaffolding = "/**\n * \n * @param x \n * @param y\n */";
-const oneIndentEmptyScaffolding = "/**\n     * \n     * @param x \n     * @param y\n */";
+const noIndentScaffolding = "/**\n * \n * @param x\n * @param y\n */";
+const oneIndentScaffolding = "/**\n     * \n     * @param x\n     * @param y\n     */";
 const noIndentOffset = 7;
-const oneIndentOffset = noIndentOffset + 4;
\ No newline at end of file
+const oneIndentOffset = noIndentOffset + 4;
+
+goTo.marker("0");
+verify.DocCommentScaffolding(noIndentScaffolding, noIndentOffset);
+
+goTo.marker("1");
+verify.DocCommentScaffolding(oneIndentScaffolding, oneIndentOffset);
\ No newline at end of file
diff --git a/tests/cases/fourslash/docCommentScaffoldingInMultiLineComment.ts b/tests/cases/fourslash/docCommentScaffoldingInMultiLineComment.ts
index 7055cc376cd..cff57a68305 100644
--- a/tests/cases/fourslash/docCommentScaffoldingInMultiLineComment.ts
+++ b/tests/cases/fourslash/docCommentScaffoldingInMultiLineComment.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
-// @Filename: emptyFile.ts
+// @Filename: justAComment.ts
 //// /* /*0*/ */
+
 goTo.marker("0");
-verify.DocCommentScaffolding("/**", 3);
\ No newline at end of file
+verify.noDocCommentScaffolding();
\ No newline at end of file
diff --git a/tests/cases/fourslash/docCommentScaffoldingInSingleLineComment.ts b/tests/cases/fourslash/docCommentScaffoldingInSingleLineComment.ts
index 2c8e7afc397..99d0a539d52 100644
--- a/tests/cases/fourslash/docCommentScaffoldingInSingleLineComment.ts
+++ b/tests/cases/fourslash/docCommentScaffoldingInSingleLineComment.ts
@@ -1,22 +1,14 @@
 /// <reference path='fourslash.ts' />
 
-// @Filename: emptyFile.ts
+// @Filename: justAComment.ts
 //// // We want to check off-by-one errors in assessing the end of the comment, so we check twice,
 //// // first with a trailing space and then without.
 //// // /*0*/ 
 //// // /*1*/
-/////*2*/
 //// // We also want to check EOF handling at the end of a comment
-//// // /*3*/
+//// // /*2*/
 
-goTo.marker("0");
-verify.DocCommentScaffolding("/**", 3);
-
-goTo.marker("1");
-verify.DocCommentScaffolding("/**", 3);
-
-goTo.marker("2");
-verify.DocCommentScaffolding("/** */", 3);
-
-goTo.marker("3");
-verify.DocCommentScaffolding("/**", 3);
\ No newline at end of file
+test.markers().forEach((marker) => {
+    goTo.position(marker.position);
+    verify.noDocCommentScaffolding();
+});
\ No newline at end of file
diff --git a/tests/cases/fourslash/docCommentScaffoldingIndentation.ts b/tests/cases/fourslash/docCommentScaffoldingIndentation.ts
index 77031ad14e1..53119aae138 100644
--- a/tests/cases/fourslash/docCommentScaffoldingIndentation.ts
+++ b/tests/cases/fourslash/docCommentScaffoldingIndentation.ts
@@ -1,9 +1,9 @@
 /// <reference path='fourslash.ts' />
 
-// @Filename: emptyFile.ts
+// @Filename: indents.ts
 /////*0*/
 ////    /*1*/
-////        /*2*/function /*3*/foo/*4*/(/*5*/) /*6*/{ /*7*/}/*8*/
+////        /*2*/function foo() { }
 
 const noIndentEmptyScaffolding = "/**\n * \n */";
 const oneIndentEmptyScaffolding = "/**\n     * \n     */";
diff --git a/tests/cases/fourslash/docCommentScaffoldingInsideFunctionDeclaration.ts b/tests/cases/fourslash/docCommentScaffoldingInsideFunctionDeclaration.ts
index dd154042dab..6a7881339ad 100644
--- a/tests/cases/fourslash/docCommentScaffoldingInsideFunctionDeclaration.ts
+++ b/tests/cases/fourslash/docCommentScaffoldingInsideFunctionDeclaration.ts
@@ -1,25 +1,9 @@
 /// <reference path='fourslash.ts' />
 
-// @Filename: emptyFile.ts
-////function /*0*/foo/*1*/(/*2*/) /*3*/{ /*4*/}/*5*/
+// @Filename: functionDecl.ts
+////function /*0*/foo/*1*/(/*2*/) /*3*/{ /*4*/}
 
-const emptyCompletion = "/** */";
-const emptyIndent = 3;
-
-goTo.marker("0");
-verify.DocCommentScaffolding(emptyCompletion, emptyIndent);
-
-goTo.marker("1");
-verify.DocCommentScaffolding(emptyCompletion, emptyIndent);
-
-goTo.marker("2");
-verify.DocCommentScaffolding(emptyCompletion, emptyIndent);
-
-goTo.marker("3");
-verify.DocCommentScaffolding(emptyCompletion, emptyIndent);
-
-goTo.marker("4");
-verify.DocCommentScaffolding(emptyCompletion, emptyIndent);
-
-goTo.marker("5");
-verify.DocCommentScaffolding(emptyCompletion, emptyIndent);
+test.markers().forEach((marker) => {
+    goTo.position(marker.position);
+    verify.noDocCommentScaffolding();
+});
diff --git a/tests/cases/fourslash/docCommentScaffoldingRegex.ts b/tests/cases/fourslash/docCommentScaffoldingRegex.ts
new file mode 100644
index 00000000000..374bc94ef5e
--- /dev/null
+++ b/tests/cases/fourslash/docCommentScaffoldingRegex.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: regex.ts
+////var regex = /*0*///*1*/asdf/*2*/ /*3*///*4*/;
+
+test.markers().forEach((marker) => {
+    goTo.position(marker.position);
+    verify.noDocCommentScaffolding();
+});
\ No newline at end of file
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index c5446ef4148..9c4b4be5d7a 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -382,6 +382,18 @@ module FourSlashInterface {
         public DocCommentScaffolding(expectedText: string, expectedOffset: number) {
             FourSlash.currentTestState.verifyDocCommentScaffolding({ newText: expectedText, cursorOffset: expectedOffset });
         }
+        
+        public noDocCommentScaffolding() {
+            const expectedText = "";
+            const expectedOffset = 0;
+            this.DocCommentScaffolding(expectedText, expectedOffset);
+        }
+        
+        public emptyTemplateDocCommentScaffolding() {
+            const expectedText = "/** */";
+            const expectedOffset = 3;
+            this.DocCommentScaffolding(expectedText, expectedOffset);
+        }
 
         public getScriptLexicalStructureListCount(count: number) {
             FourSlash.currentTestState.verifyGetScriptLexicalStructureListCount(count);