diff --git a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/QueryExpressions/E_BadGroupValBy02.fs b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/QueryExpressions/E_BadGroupValBy02.fs
index 8f4388044c9..2000105ad3c 100644
--- a/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/QueryExpressions/E_BadGroupValBy02.fs
+++ b/tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/QueryExpressions/E_BadGroupValBy02.fs
@@ -1,7 +1,7 @@
 // #Conformance #DataExpressions #Query
 // DevDiv:210830, groupValBy with poor diagnostics
-//<Expects status="error" span="(8,7-8,17)" id="FS3099">'groupValBy' is used with an incorrect number of arguments. This is a custom operation in this query or computation expression. Expected 2 argument(s), but given 3.</Expects>
-//<Expects status="error" span="(8,7-8,33)" id="FS0001">This expression was expected to have type.+'System\.Linq\.IGrouping<'a,'b>'.+but here has type.+'unit'</Expects>
+//<Expects status="error" span="(9,7-9,17)" id="FS3099">.+</Expects>
+//<Expects status="error" span="(9,7-9,33)" id="FS0001">This expression was expected to have type.+'System\.Linq\.IGrouping<'a,'b>'.+but here has type.+'unit'</Expects>
 let words = ["blueberry"; "chimpanzee"; ]
 let wordGroups =
   query {
diff --git a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/Comments/E_ocamlstyle_nested006.fs b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/Comments/E_ocamlstyle_nested006.fs
index 7f266a65a19..106ddc7c41d 100644
--- a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/Comments/E_ocamlstyle_nested006.fs
+++ b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/Comments/E_ocamlstyle_nested006.fs
@@ -1,9 +1,9 @@
 // #Regression #Conformance #LexicalAnalysis 
 // Regression test for FSHARP1.0:1561
 // The OCaml (** *) feature is now gone, so this test will be a negative test from now on.
-//<Expects status="error" span="(15,1)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(10:1\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
-//<Expects status="error" span="(15,1)" id="FS0010">Incomplete structured construct at or before this point in binding$</Expects>
-//<Expects status="error" span="(10,10)" id="FS0516">End of file in comment begun at or before here$</Expects>
+//<Expects status="error" span="(14,1)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(9:1\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
+//<Expects status="error" span="(14,1)" id="FS0010">Incomplete structured construct at or before this point in binding$</Expects>
+//<Expects status="error" span="(9,10)" id="FS0516">End of file in comment begun at or before here$</Expects>
 
 
 let y6 = (** This is a comment with (***) 6 (**)
diff --git a/tests/fsharpqa/Source/Conformance/LexicalFiltering/HashLight/W_OffsideAccessibility01.fs b/tests/fsharpqa/Source/Conformance/LexicalFiltering/HashLight/W_OffsideAccessibility01.fs
index ade12160e53..a2283e30777 100644
--- a/tests/fsharpqa/Source/Conformance/LexicalFiltering/HashLight/W_OffsideAccessibility01.fs
+++ b/tests/fsharpqa/Source/Conformance/LexicalFiltering/HashLight/W_OffsideAccessibility01.fs
@@ -2,7 +2,7 @@
 // FSB 2150, Offside rule for #light code should set offside to left of accessibility modifier if present
 
 //<Expects status="error" span="(18,5-18,8)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(17:5\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
-//<Expects status="error" span="(18,5-18,8)" id="FS3524">Expecting expression\.$</Expects>
+//<Expects status="error" span="(18,5-18,8)" id="FS3524">Expecting expression$</Expects>
 //<Expects status="error" span="(20,5-20,6)" id="FS0010">Unexpected symbol '{' in member definition$</Expects>
 
 open System
diff --git a/tests/fsharpqa/Source/Diagnostics/NONTERM/tuplewithlazy01.fs b/tests/fsharpqa/Source/Diagnostics/NONTERM/tuplewithlazy01.fs
index 27b2a091a49..d6b643b5956 100644
--- a/tests/fsharpqa/Source/Diagnostics/NONTERM/tuplewithlazy01.fs
+++ b/tests/fsharpqa/Source/Diagnostics/NONTERM/tuplewithlazy01.fs
@@ -2,7 +2,7 @@
 // Regression test for DevDiv:64339
 // Note that the bug still repros in CHK/DBG bits - we will knownfail it
 //<Expects status="error" span="(8,25-8,29)" id="FS0010">Unexpected keyword 'lazy' in type definition$</Expects>
-//<Expects status="error" span="(11,29-11,33)" id="FS0010">Unexpected keyword 'lazy'.*</Expects>
+//<Expects status="error" span="(11,29-11,33)" id="FS0010">Unexpected keyword 'lazy'.+</Expects>
 
 // 5 elements -> ok
 type Ok(a, b, c, d, e : lazy<int>) = class end
diff --git a/tests/fsharpqa/Source/Diagnostics/NONTERM/tuplewithlazy01b.fs b/tests/fsharpqa/Source/Diagnostics/NONTERM/tuplewithlazy01b.fs
index 8a11948fe54..449e6052344 100644
--- a/tests/fsharpqa/Source/Diagnostics/NONTERM/tuplewithlazy01b.fs
+++ b/tests/fsharpqa/Source/Diagnostics/NONTERM/tuplewithlazy01b.fs
@@ -2,7 +2,7 @@
 // Regression test for DevDiv:64339
 // Note that the bug still repros in CHK/DBG bits - we will knownfail it
 //<Expects status="error" span="(8,25-8,29)" id="FS0010">Unexpected keyword 'lazy' in type definition$</Expects>
-//<Expects status="error" span="(8,25-8,29)" id="FS0010">Unexpected keyword 'lazy'.*</Expects>
+//<Expects status="error" span="(8,25-8,29)" id="FS0010">.+</Expects>
 
 // 5 elements -> ok
 type Ok(a, b, c, d, e : lazy<int>) = class end
diff --git a/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/du_with01.fs b/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/du_with01.fs
index a296a9b46a1..47c353c2f16 100644
--- a/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/du_with01.fs
+++ b/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/du_with01.fs
@@ -1,5 +1,5 @@
 // #Regression #Diagnostics 
-// <Expects status="error" span="(8,1-8,7)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(6:1\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
+// <Expects status="error" span="(8,1-8,7)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(5:1\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
 // Note: this is now a positive test (see DevDiv:258510)
 
 type C =
diff --git a/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_equal01.fsx b/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_equal01.fsx
index 912dd2b40a9..e6dbdcefaa8 100644
--- a/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_equal01.fsx
+++ b/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_equal01.fsx
@@ -1,4 +1,4 @@
 // #Regression #Diagnostics 
-//<Expects status="error" span="(5,1-5,1)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(5:1\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
+//<Expects status="error" span="(5,1-5,1)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(4:1\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
 //<Expects status="error" span="(4,6-4,8)" id="FS0547">A type definition requires one or more members or other declarations\. If you intend to define an empty class, struct or interface, then use 'type \.\.\. = class end', 'interface end' or 'struct end'\.$</Expects>
 type C() = 
diff --git a/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_equal02.fsi b/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_equal02.fsi
index 30ba825548b..257e4589946 100644
--- a/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_equal02.fsi
+++ b/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_equal02.fsi
@@ -1,5 +1,5 @@
 // #Regression #Diagnostics 
-//<Expects status="error" span="(8,1-8,1)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(9:1\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
+//<Expects status="error" span="(8,1-8,1)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(7:1\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
 //<Expects status="error" span="(7,6-7,9)" id="FS0547">A type definition requires one or more members or other declarations\. If you intend to define an empty class, struct or interface, then use 'type \.\.\. = class end', 'interface end' or 'struct end'\.$</Expects>
 //<Expects status="error" span="(4,1-4,1)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(3:1\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
 //<Expects status="error" span="(3,6-3,8)" id="FS0547">A type definition requires one or more members or other declarations\. If you intend to define an empty class, struct or interface, then use 'type \.\.\. = class end', 'interface end' or 'struct end'\.$</Expects>
diff --git a/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_parens01.fs b/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_parens01.fs
index c40db1afc6f..91562efcc52 100644
--- a/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_parens01.fs
+++ b/tests/fsharpqa/Source/Diagnostics/ParsingAtEOF/type_id_parens01.fs
@@ -1,5 +1,5 @@
 // #Regression #Diagnostics 
-//<Expects status="error" span="(7,1-7,1)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(7:1\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
+//<Expects status="error" span="(7,1-7,1)" id="FS0058">Possible incorrect indentation: this token is offside of context started at position \(6:1\)\. Try indenting this token further or using standard formatting conventions\.$</Expects>
 //<Expects status="error" span="(6,6-6,8)" id="FS0547">A type definition requires one or more members or other declarations\. If you intend to define an empty class, struct or interface, then use 'type \.\.\. = class end', 'interface end' or 'struct end'\.$</Expects>