diff --git a/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticBracketCompletionTests.cs b/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticBracketCompletionTests.cs
index ebb6bffa52547002256204778666a2ca90879f11..5f988aca04fd8280abfd0cd7c25a8beee4b3fb5f 100644
--- a/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticBracketCompletionTests.cs
+++ b/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticBracketCompletionTests.cs
@@ -14,32 +14,26 @@ public class AutomaticBracketCompletionTests : AbstractAutomaticBraceCompletionT
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
         public void Creation()
         {
-            using (var session = CreateSession("$$"))
-            {
-                Assert.NotNull(session);
-            }
+            using var session = CreateSession("$$");
+            Assert.NotNull(session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
         public void Attribute_TopLevel()
         {
-            using (var session = CreateSession("$$"))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession("$$");
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-            }
+            CheckStart(session.Session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
         public void Attribute_TopLevel2()
         {
-            using (var session = CreateSession("using System;$$"))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession("using System;$$");
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-            }
+            CheckStart(session.Session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -49,10 +43,8 @@ public void InvalidLocation_String()
 {
     string s = ""$$
 }";
-            using (var session = CreateSession(code))
-            {
-                Assert.Null(session);
-            }
+            using var session = CreateSession(code);
+            Assert.Null(session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -63,10 +55,8 @@ public void InvalidLocation_String2()
     string s = @""
 $$
 }";
-            using (var session = CreateSession(code))
-            {
-                Assert.Null(session);
-            }
+            using var session = CreateSession(code);
+            Assert.Null(session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -76,10 +66,8 @@ public void InvalidLocation_Comment()
 {
     //$$
 }";
-            using (var session = CreateSession(code))
-            {
-                Assert.Null(session);
-            }
+            using var session = CreateSession(code);
+            Assert.Null(session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -89,10 +77,8 @@ public void InvalidLocation_Comment2()
 {
     /* $$
 }";
-            using (var session = CreateSession(code))
-            {
-                Assert.Null(session);
-            }
+            using var session = CreateSession(code);
+            Assert.Null(session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -102,10 +88,8 @@ public void InvalidLocation_Comment3()
 {
     /// $$
 }";
-            using (var session = CreateSession(code))
-            {
-                Assert.Null(session);
-            }
+            using var session = CreateSession(code);
+            Assert.Null(session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -115,10 +99,8 @@ public void InvalidLocation_Comment4()
 {
     /** $$
 }";
-            using (var session = CreateSession(code))
-            {
-                Assert.Null(session);
-            }
+            using var session = CreateSession(code);
+            Assert.Null(session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -131,12 +113,10 @@ void Method()
         /* */$$
     }
 }";
-            using (var session = CreateSession(code))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession(code);
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-            }
+            CheckStart(session.Session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -149,12 +129,10 @@ void Method()
         /** */$$
     }
 }";
-            using (var session = CreateSession(code))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession(code);
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-            }
+            CheckStart(session.Session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -167,12 +145,10 @@ void Method()
         var s = """"$$
     }
 }";
-            using (var session = CreateSession(code))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession(code);
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-            }
+            CheckStart(session.Session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -185,12 +161,10 @@ void Method()
         var s = @""""$$
     }
 }";
-            using (var session = CreateSession(code))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession(code);
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-            }
+            CheckStart(session.Session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -199,12 +173,10 @@ public void Attribute_OpenBracket()
             var code = @"$$
 class C { }";
 
-            using (var session = CreateSession(code))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession(code);
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-            }
+            CheckStart(session.Session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -213,13 +185,11 @@ public void Attribute_OpenBracket_Delete()
             var code = @"$$
 class C { }";
 
-            using (var session = CreateSession(code))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession(code);
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-                CheckBackspace(session.Session);
-            }
+            CheckStart(session.Session);
+            CheckBackspace(session.Session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -228,13 +198,11 @@ public void Attribute_OpenBracket_Tab()
             var code = @"$$
 class C { }";
 
-            using (var session = CreateSession(code))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession(code);
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-                CheckTab(session.Session);
-            }
+            CheckStart(session.Session);
+            CheckTab(session.Session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -243,13 +211,11 @@ public void Attribute_OpenBracket_CloseBracket()
             var code = @"$$
 class C { }";
 
-            using (var session = CreateSession(code))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession(code);
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-                CheckOverType(session.Session);
-            }
+            CheckStart(session.Session);
+            CheckOverType(session.Session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -260,12 +226,10 @@ public void Array_Multiple_Invalid()
     int [$$]
 }";
 
-            using (var session = CreateSession(code))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession(code);
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-            }
+            CheckStart(session.Session);
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
@@ -275,12 +239,10 @@ public void Array_Nested()
 {
     int [] i = new int [arr$$]
 }";
-            using (var session = CreateSession(code))
-            {
-                Assert.NotNull(session);
+            using var session = CreateSession(code);
+            Assert.NotNull(session);
 
-                CheckStart(session.Session);
-            }
+            CheckStart(session.Session);
         }
 
         internal Holder CreateSession(string code)