diff --git a/src/Analyzers/CSharp/Tests/RemoveUnnecessaryNullableDirective/CSharpRemoveRedundantNullableDirectiveTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnnecessaryNullableDirective/CSharpRemoveRedundantNullableDirectiveTests.cs
index 8e9539da0ed53..b40e3858d7386 100644
--- a/src/Analyzers/CSharp/Tests/RemoveUnnecessaryNullableDirective/CSharpRemoveRedundantNullableDirectiveTests.cs
+++ b/src/Analyzers/CSharp/Tests/RemoveUnnecessaryNullableDirective/CSharpRemoveRedundantNullableDirectiveTests.cs
@@ -122,8 +122,7 @@ class Program
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestRedundantRestoreDiffersFromPriorContext(NullableContextOptions compilationContext)
         {
             var enable = compilationContext != NullableContextOptions.Enable;
@@ -146,8 +145,7 @@ class Program
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestRedundantRestoreMatchesCompilation(NullableContextOptions compilationContext)
         {
             await VerifyCodeFixAsync(
diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
index af3a950e24d70..95264c5eb6497 100644
--- a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
+++ b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
@@ -2180,8 +2180,7 @@ class MyClass
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task MultipleFields_AllUnused_FixOne(
             [CombinatorialValues("[|_goo|]", "[|_goo|] = 0")] string firstField,
             [CombinatorialValues("[|_bar|]", "[|_bar|] = 2")] string secondField,
diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedParametersAndValues/RemoveUnusedValueAssignmentTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedParametersAndValues/RemoveUnusedValueAssignmentTests.cs
index 710a013428e3c..a0e2818fda484 100644
--- a/src/Analyzers/CSharp/Tests/RemoveUnusedParametersAndValues/RemoveUnusedValueAssignmentTests.cs
+++ b/src/Analyzers/CSharp/Tests/RemoveUnusedParametersAndValues/RemoveUnusedValueAssignmentTests.cs
@@ -496,8 +496,7 @@ int M(int {|IDE0060:p|})
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Initialization_NonConstantValue_LocalReference(
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option,
             [CombinatorialValues(CodeFixTestBehaviors.None, CodeFixTestBehaviors.FixOne)] CodeFixTestBehaviors testBehaviors)
@@ -557,8 +556,7 @@ int M()
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Assignment_NonConstantValue_LocalReference(
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option,
             [CombinatorialValues(CodeFixTestBehaviors.None, CodeFixTestBehaviors.FixOne)] CodeFixTestBehaviors testBehaviors)
@@ -1115,8 +1113,7 @@ public static explicit operator C(int {|IDE0060:i|})
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NestedAssignment_ConstantValue(
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option,
             [CombinatorialValues(CodeFixTestBehaviors.None, CodeFixTestBehaviors.FixOne | CodeFixTestBehaviors.SkipFixAllCheck)] CodeFixTestBehaviors testBehaviors)
@@ -1195,8 +1192,7 @@ int M(int {|IDE0060:x|}, int {|IDE0060:y|})
             await test.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NestedAssignment_NonConstantValue(
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option,
             [CombinatorialValues(CodeFixTestBehaviors.None, CodeFixTestBehaviors.FixOne | CodeFixTestBehaviors.SkipFixAllCheck)] CodeFixTestBehaviors testBehaviors)
@@ -1329,8 +1325,7 @@ int M()
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task IncrementOrDecrementOperator_ValueUsed_SameStatement(
             [CombinatorialValues("++", "--")] string @operator,
             bool applyAsPrefix,
@@ -1384,8 +1379,7 @@ void M(int x)
             await test.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task IncrementOrDecrementOperator_ValueUsed_LaterStatement(
             [CombinatorialValues("++", "--")] string @operator,
             bool applyAsPrefix,
@@ -1415,8 +1409,7 @@ int M(int x)
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task IncrementOrDecrementOperator_ValueUnused(
             [CombinatorialValues("++", "--")] string @operator,
             bool applyAsPrefix,
@@ -1454,8 +1447,7 @@ void M(int {|IDE0060:x|})
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task CompoundAssignmentOperator_ValueUsed_SameStatement(
             [CombinatorialValues("1" /*Constant*/, "M2()" /*Non-constant*/)] string rightHandSide,
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option)
@@ -1511,8 +1503,7 @@ void M(int x)
             await test.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task CompoundAssignmentOperator_ValueUsed_LaterStatement(
             [CombinatorialValues("1" /*Constant*/, "M2()" /*Non-constant*/)] string rightHandSide,
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option)
@@ -1542,8 +1533,7 @@ int M(int x)
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task CompoundLogicalOrOperator_ValueUsed_LaterStatement(
             [CombinatorialValues("true" /*Constant*/, "M2()" /*Non-constant*/)] string rightHandSide,
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option)
@@ -1573,8 +1563,7 @@ bool M(bool x)
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task CompoundLogicalOrOperator_ValueUsed_LaterStatement_02(
             [CombinatorialValues("true" /*Constant*/, "M2()" /*Non-constant*/)] string rightHandSide,
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option)
@@ -2781,8 +2770,7 @@ void M(object p)
                 """, options: PreferDiscard, parseOptions: new CSharpParseOptions(LanguageVersion.CSharp9));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DeclarationPatternInSwitchCase_WithOnlyWriteReference_PreferUnusedLocal(
             [CombinatorialValues(LanguageVersion.CSharp8, LanguageVersion.CSharp9)] LanguageVersion languageVersion)
         {
@@ -2803,8 +2791,7 @@ void M(object p)
                 """, new TestParameters(options: PreferUnusedLocal, parseOptions: new CSharpParseOptions(languageVersion)));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DeclarationPatternInSwitchCase_WithOnlyWriteReference_TypePattern(
             [CombinatorialValues(CodeFixTestBehaviors.None, CodeFixTestBehaviors.FixOne)] CodeFixTestBehaviors testBehaviors)
         {
diff --git a/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests.cs b/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests.cs
index c17cda9948689..d3c2a61bced67 100644
--- a/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests.cs
+++ b/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests.cs
@@ -6374,8 +6374,7 @@ static void Main(string[] args)
         /// Note that this test verifies the current end of line sequence in using directives is preserved regardless of
         /// whether this matches the end_of_line value in .editorconfig or not.
         /// </summary>
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/62976")]
         public async Task TestAddUsingPreservesNewlines1(TestHost testHost, [CombinatorialValues("\n", "\r\n")] string sourceNewLine, [CombinatorialValues("\n", "\r\n")] string configuredNewLine)
         {
@@ -6418,8 +6417,7 @@ class Class
         /// Note that this test verifies the current end of line sequence in using directives is preserved regardless of
         /// whether this matches the end_of_line value in .editorconfig or not.
         /// </summary>
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/62976")]
         public async Task TestAddUsingPreservesNewlines2(TestHost testHost, [CombinatorialValues("\n", "\r\n")] string sourceNewLine, [CombinatorialValues("\n", "\r\n")] string configuredNewLine)
         {
@@ -6473,8 +6471,7 @@ class Class
                 parameters: new TestParameters(options: Option(FormattingOptions2.NewLine, configuredNewLine), testHost: testHost));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/62976")]
         public async Task TestAddUsingPreservesNewlines3(TestHost testHost, [CombinatorialValues("\n", "\r\n")] string sourceNewLine, [CombinatorialValues("\n", "\r\n")] string configuredNewLine)
         {
@@ -6528,8 +6525,7 @@ class Class
                 parameters: new TestParameters(options: Option(FormattingOptions2.NewLine, configuredNewLine), testHost: testHost));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/24642")]
         public async Task TestAddUsingWithMalformedGeneric(TestHost testHost)
         {
@@ -6552,8 +6548,7 @@ class Class
                 parameters: new TestParameters(testHost: testHost));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestOutsideOfMethodWithMalformedGenericParameters(TestHost testHost)
         {
             await TestInRegularAndScript1Async(
diff --git a/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_ExtensionMethods.cs b/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_ExtensionMethods.cs
index ce2ca8aeced1d..068ec267af60a 100644
--- a/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_ExtensionMethods.cs
+++ b/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_ExtensionMethods.cs
@@ -1107,8 +1107,7 @@ public static void Deconstruct(this Program p, out int x, out int y) { }
 parseOptions: null);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/16547")]
         public async Task TestAddUsingForAddExtensionMethodWithSameNameAsProperty(TestHost testHost)
         {
@@ -1171,8 +1170,7 @@ public static Foo Self(this Foo foo)
 }", testHost);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/39155")]
         public async Task TestExtensionGetAwaiterOverload(TestHost testHost)
         {
@@ -1262,8 +1260,7 @@ public void GetResult()
 ", testHost);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/39155")]
         public async Task TestExtensionSelectOverload(TestHost testHost)
         {
diff --git a/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_Razor.cs b/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_Razor.cs
index 9c7234d79258b..c216fb6cc271c 100644
--- a/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_Razor.cs
+++ b/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_Razor.cs
@@ -14,8 +14,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.AddUsing
     [Trait(Traits.Feature, Traits.Features.CodeActionsAddImport)]
     public partial class AddUsingTests_Razor : AbstractAddUsingTests
     {
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAddIntoHiddenRegionWithModernSpanMapper(TestHost host)
         {
             await TestAsync(
diff --git a/src/EditorFeatures/CSharpTest/Completion/ArgumentProviders/ContextVariableArgumentProviderTests.cs b/src/EditorFeatures/CSharpTest/Completion/ArgumentProviders/ContextVariableArgumentProviderTests.cs
index acb913736e4e8..13ca5cc67e947 100644
--- a/src/EditorFeatures/CSharpTest/Completion/ArgumentProviders/ContextVariableArgumentProviderTests.cs
+++ b/src/EditorFeatures/CSharpTest/Completion/ArgumentProviders/ContextVariableArgumentProviderTests.cs
@@ -41,8 +41,7 @@ void Target({type} arg)
             await VerifyDefaultValueAsync(markup, expectedDefaultValue: null, previousDefaultValue: "prior");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestOutVariable(
             [CombinatorialValues("string", "bool", "int?")] string type,
             [CombinatorialValues("out", "ref", "in")] string modifier)
diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTrackingServiceTests.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTrackingServiceTests.cs
index 66757d94eb47e..cc83029109a30 100644
--- a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTrackingServiceTests.cs
+++ b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTrackingServiceTests.cs
@@ -22,8 +22,7 @@ namespace Microsoft.CodeAnalysis.CSharp.EditAndContinue.UnitTests
     [UseExportProvider]
     public class ActiveStatementTrackingServiceTests
     {
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TrackingService_GetLatestSpansAsync(bool scheduleInitialTrackingBeforeOpenDoc)
         {
             var source1 = "class C { void F() => G(1); void G(int a) => System.Console.WriteLine(1); }";
diff --git a/src/EditorFeatures/CSharpTest/NavigateTo/NavigateToTests.cs b/src/EditorFeatures/CSharpTest/NavigateTo/NavigateToTests.cs
index 70cbfeaa534c6..14f570ec10efa 100644
--- a/src/EditorFeatures/CSharpTest/NavigateTo/NavigateToTests.cs
+++ b/src/EditorFeatures/CSharpTest/NavigateTo/NavigateToTests.cs
@@ -31,8 +31,7 @@ public class NavigateToTests : AbstractNavigateToTests
         protected override EditorTestWorkspace CreateWorkspace(string content, TestComposition composition)
             => EditorTestWorkspace.CreateCSharp(content, composition: composition);
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NoItemsForEmptyFile(TestHost testHost, Composition composition)
         {
             await TestAsync(testHost, composition, "", async w =>
@@ -41,8 +40,7 @@ await TestAsync(testHost, composition, "", async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindClass(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -57,8 +55,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindRecord(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -73,8 +70,7 @@ record Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindRecordClass(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -89,8 +85,7 @@ record class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindRecordStruct(TestHost testHost, Composition composition)
         {
             var content = XElement.Parse("""
@@ -111,8 +106,7 @@ await TestAsync(testHost, composition, content, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindClassInFileScopedNamespace(TestHost testHost, Composition composition)
         {
             var content = XElement.Parse("""
@@ -132,8 +126,7 @@ await TestAsync(testHost, composition, content, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindVerbatimClass(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -152,8 +145,7 @@ class @static
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindNestedClass(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -174,8 +166,7 @@ internal class DogBed
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindMemberInANestedClass(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -199,8 +190,7 @@ public void Method()
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindGenericClassWithConstraints(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -217,8 +207,7 @@ class Goo<T> where T : IEnumerable
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindGenericMethodWithConstraints(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -238,8 +227,7 @@ public void Bar<T>(T item) where T : IComparable<T>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindPartialClass(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -264,8 +252,7 @@ partial class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindTypesInMetadata(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -280,8 +267,7 @@ await TestAsync(
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindClassInNamespace(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -299,8 +285,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindStruct(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -315,8 +300,7 @@ struct Bar
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindEnum(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -334,8 +318,7 @@ enum Colors
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindEnumMember(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -353,8 +336,7 @@ enum Colors
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindField1(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -370,8 +352,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindField2(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -387,8 +368,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindField3(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -403,8 +383,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindVerbatimField(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -424,8 +403,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindPtrField1(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -440,8 +418,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindPtrField2(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -457,8 +434,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindConstField(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -474,8 +450,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindIndexer(TestHost testHost, Composition composition)
         {
             var program = @"class Goo { int[] arr; public int this[int i] { get { return arr[i]; } set { arr[i] = value; } } }";
@@ -486,8 +461,7 @@ await TestAsync(testHost, composition, program, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindEvent(TestHost testHost, Composition composition)
         {
             var program = "class Goo { public event EventHandler ChangedEventHandler; }";
@@ -498,8 +472,7 @@ await TestAsync(testHost, composition, program, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindAutoProperty(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -515,8 +488,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindMethod(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -532,8 +504,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindVerbatimMethod(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -553,8 +524,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindParameterizedMethod(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -572,8 +542,7 @@ void DoSomething(int a, string b)
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindConstructor(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -591,8 +560,7 @@ public Goo()
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindParameterizedConstructor(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -610,8 +578,7 @@ public Goo(int i)
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindStaticConstructor(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -629,8 +596,7 @@ static Goo()
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindPartialMethods(TestHost testHost, Composition composition)
         {
             await TestAsync(testHost, composition, "partial class Goo { partial void Bar(); } partial class Goo { partial void Bar() { Console.Write(\"hello\"); } }", async w =>
@@ -644,8 +610,7 @@ public async Task FindPartialMethods(TestHost testHost, Composition composition)
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindPartialMethodDefinitionOnly(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -661,8 +626,7 @@ partial class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindPartialMethodImplementationOnly(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -680,8 +644,7 @@ partial void Bar()
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindOverriddenMembers(TestHost testHost, Composition composition)
         {
             var program = "class Goo { public virtual string Name { get; set; } } class DogBed : Goo { public override string Name { get { return base.Name; } set {} } }";
@@ -710,8 +673,7 @@ await TestAsync(testHost, composition, program, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindInterface(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -726,8 +688,7 @@ public interface IGoo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindTopLevelLocalFunction(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -742,8 +703,7 @@ void Goo()
 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindTopLevelLocalFunction_WithParameters(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -758,8 +718,7 @@ void Goo(int i)
 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindTopLevelLocalFunction_WithTypeArgumentsAndParameters(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -774,8 +733,7 @@ void Goo<T>(int i)
 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindNestedLocalFunctionTopLevelStatements(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -793,8 +751,7 @@ void Bar()
 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindLocalFunctionInMethod(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -818,8 +775,7 @@ void Bar()
 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindNestedLocalFunctionInMethod(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -843,8 +799,7 @@ void Bar()
 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindDelegateInNamespace(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -860,8 +815,7 @@ namespace Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindLambdaExpression(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -879,8 +833,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindArray(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -896,8 +849,7 @@ class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindClassAndMethodWithSameName(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -924,8 +876,7 @@ void Goo()
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FindMethodNestedInGenericTypes(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -949,8 +900,7 @@ void M()
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task OrderingOfConstructorsAndTypes(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -988,8 +938,7 @@ static C2()
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NavigateToMethodWithNullableParameter(TestHost testHost, Composition composition)
         {
             await TestAsync(
@@ -1007,8 +956,7 @@ void M(object? o)
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task StartStopSanity(TestHost testHost, Composition composition)
         {
             // Verify that multiple calls to start/stop and dispose don't blow up
@@ -1032,8 +980,7 @@ public class Goo
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DescriptionItems(TestHost testHost, Composition composition)
         {
             await TestAsync(testHost, composition, """
@@ -1060,8 +1007,7 @@ void assertDescription(string label, string value)
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TermSplittingTest1(TestHost testHost, Composition composition)
         {
             var source = "class SyllableBreaking {int GetKeyWord; int get_key_word; string get_keyword; int getkeyword; int wake;}";
@@ -1080,8 +1026,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TermSplittingTest2(TestHost testHost, Composition composition)
         {
             var source = "class SyllableBreaking {int GetKeyWord; int get_key_word; string get_keyword; int getkeyword; int wake;}";
@@ -1097,8 +1042,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TermSplittingTest3(TestHost testHost, Composition composition)
         {
             var source = "class SyllableBreaking {int GetKeyWord; int get_key_word; string get_keyword; int getkeyword; int wake;}";
@@ -1114,8 +1058,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TermSplittingTest4(TestHost testHost, Composition composition)
         {
             var source = "class SyllableBreaking {int GetKeyWord; int get_key_word; string get_keyword; int getkeyword; int wake;}";
@@ -1126,8 +1069,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TermSplittingTest5(TestHost testHost, Composition composition)
         {
             var source = "class SyllableBreaking {int GetKeyWord; int get_key_word; string get_keyword; int getkeyword; int wake;}";
@@ -1138,8 +1080,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TermSplittingTest6(TestHost testHost, Composition composition)
         {
             var source = "class SyllableBreaking {int GetKeyWord; int get_key_word; string get_keyword; int getkeyword; int wake;}";
@@ -1159,8 +1100,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TermSplittingTest7(TestHost testHost, Composition composition)
         {
             var source = "class SyllableBreaking {int GetKeyWord; int get_key_word; string get_keyword; int getkeyword; int wake;}";
@@ -1171,8 +1111,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestIndexer1(TestHost testHost, Composition composition)
         {
             var source =
@@ -1204,8 +1143,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DottedPattern1(TestHost testHost, Composition composition)
         {
             var source = "namespace Goo { namespace Bar { class Baz { void Quux() { } } } }";
@@ -1222,8 +1160,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DottedPattern2(TestHost testHost, Composition composition)
         {
             var source = "namespace Goo { namespace Bar { class Baz { void Quux() { } } } }";
@@ -1239,8 +1176,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DottedPattern3(TestHost testHost, Composition composition)
         {
             var source = "namespace Goo { namespace Bar { class Baz { void Quux() { } } } }";
@@ -1257,8 +1193,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DottedPattern4(TestHost testHost, Composition composition)
         {
             var source = "namespace Goo { namespace Bar { class Baz { void Quux() { } } } }";
@@ -1275,8 +1210,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DottedPattern5(TestHost testHost, Composition composition)
         {
             var source = "namespace Goo { namespace Bar { class Baz { void Quux() { } } } }";
@@ -1293,8 +1227,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DottedPattern6(TestHost testHost, Composition composition)
         {
             var source = "namespace Goo { namespace Bar { class Baz { void Quux() { } } } }";
@@ -1310,8 +1243,7 @@ await TestAsync(testHost, composition, source, async w =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/Roslyn/issues/7855")]
         public async Task DottedPattern7(TestHost testHost, Composition composition)
         {
@@ -1720,8 +1652,7 @@ public void Method(
 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/57873")]
         public async Task FindRecordMember1(TestHost testHost, Composition composition)
         {
@@ -1737,8 +1668,7 @@ record Goo(int Member)
 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/57873")]
         public async Task FindRecordMember2(TestHost testHost, Composition composition)
         {
@@ -1755,8 +1685,7 @@ record Goo(int Member)
 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/57873")]
         public async Task FindRecordMember3(TestHost testHost, Composition composition)
         {
@@ -1778,8 +1707,7 @@ private static bool IsFromFile(NavigateToItem item, string fileName)
             return ((CodeAnalysis.NavigateTo.INavigateToSearchResult)item.Tag).NavigableItem.Document.Name == fileName;
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NavigateToPrioritizeResultInCurrentDocument1(TestHost testHost)
         {
             await TestAsync(testHost, Composition.FirstActiveAndVisible, XElement.Parse("""
@@ -1824,8 +1752,7 @@ public void VisibleMethod() { }
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NavigateToPrioritizeResultInCurrentDocument2(TestHost testHost)
         {
             await TestAsync(testHost, Composition.FirstActiveAndVisible, XElement.Parse("""
@@ -1870,8 +1797,7 @@ public void VisibleMethod() { }
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NavigateToPrioritizeResultInCurrentDocument3(TestHost testHost)
         {
             await TestAsync(testHost, Composition.FirstActiveAndVisible, XElement.Parse("""
@@ -1916,8 +1842,7 @@ public void VisibleMethod() { }
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NavigateToPrioritizeResultInCurrentDocument4(TestHost testHost)
         {
             await TestAsync(testHost, Composition.FirstActiveAndVisible, XElement.Parse("""
@@ -1962,8 +1887,7 @@ public void VisibleMethod() { }
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NavigateToPrioritizeResultInCurrentDocument5(TestHost testHost)
         {
             await TestAsync(testHost, Composition.FirstActiveAndVisible, XElement.Parse("""
diff --git a/src/EditorFeatures/CSharpTest/PdbSourceDocument/PdbSourceDocumentTests.cs b/src/EditorFeatures/CSharpTest/PdbSourceDocument/PdbSourceDocumentTests.cs
index 5052e6df59e93..3f6d6538eee27 100644
--- a/src/EditorFeatures/CSharpTest/PdbSourceDocument/PdbSourceDocumentTests.cs
+++ b/src/EditorFeatures/CSharpTest/PdbSourceDocument/PdbSourceDocumentTests.cs
@@ -21,8 +21,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.PdbSourceDocument
 {
     public partial class PdbSourceDocumentTests : AbstractPdbSourceDocumentTests
     {
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task PreprocessorSymbols1(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -42,8 +41,7 @@ public void M()
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C.M"), preprocessorSymbols: ["SOME_DEFINED_CONSTANT"]);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task PreprocessorSymbols2(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -63,8 +61,7 @@ public void M()
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C.M"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Method(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -79,8 +76,7 @@ public class C
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C.M"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Constructor(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -95,8 +91,7 @@ public class C
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C..ctor"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Parameter(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -111,8 +106,7 @@ public void M(int [|a|])
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember<IMethodSymbol>("C.M").Parameters.First());
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Class_FromTypeDefinitionDocument(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -125,8 +119,7 @@ public class [|C|]
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Constructor_FromTypeDefinitionDocument(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -138,8 +131,7 @@ public class [|C|]
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C..ctor"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NestedClass_FromTypeDefinitionDocument(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -154,8 +146,7 @@ public class [|C|]
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("Outer.C"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NestedClassConstructor_FromTypeDefinitionDocument(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -170,8 +161,7 @@ public class [|C|]
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("Outer.C..ctor"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Class_FromTypeDefinitionDocumentOfNestedClass(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -186,8 +176,7 @@ public class C
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("Outer"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Constructor_FromTypeDefinitionDocumentOfNestedClass(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -203,8 +192,7 @@ public class C
 
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NestedClass_FromMethodDocument(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -222,8 +210,7 @@ public void M()
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("Outer.C"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NestedClassConstructor_FromMethodDocument(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -242,8 +229,7 @@ public void M()
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("Outer.C..ctor"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Class_FromMethodDocumentOfNestedClass(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -262,8 +248,7 @@ public void M()
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("Outer"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Constructor_FromMethodDocumentOfNestedClass(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -282,8 +267,7 @@ public void M()
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("Outer..ctor"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Class_FromMethodDocument(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -298,8 +282,7 @@ public void M()
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Constructor_FromMethodDocument(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -314,8 +297,7 @@ public void M()
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C..ctor"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Field(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -327,8 +309,7 @@ public class C
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C.f"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Property(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -340,8 +321,7 @@ public class C
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C.P"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Property_WithBody(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -353,8 +333,7 @@ public class C
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C.P"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task EventField(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -366,8 +345,7 @@ public class C
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C.E"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task EventField_WithMethod(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -384,8 +362,7 @@ public void M()
             await TestAsync(pdbLocation, sourceLocation, source, c => c.GetMember("C.E"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Event(Location pdbLocation, Location sourceLocation)
         {
             var source = """
@@ -756,8 +733,7 @@ await RunTestAsync(async path =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task SourceFileChecksumIncorrect_NullResult(Location pdbLocation)
         {
             var source1 = """
@@ -828,8 +804,7 @@ await RunTestAsync(async path =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task EncodedEmbeddedSource_SJIS(Location pdbLocation)
         {
             var source = """
@@ -858,8 +833,7 @@ await RunTestAsync(async path =>
             });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task EncodedEmbeddedSource_SJIS_FallbackEncoding(Location pdbLocation)
         {
             var source = """
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/AbstractKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/AbstractKeywordRecommenderTests.cs
index 64530b7750d14..023bdb25ac4cc 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/AbstractKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/AbstractKeywordRecommenderTests.cs
@@ -376,8 +376,7 @@ public async Task TestNotAfterSealed()
         public async Task TestNotAfterStatic()
             => await VerifyAbsenceAsync(@"static $$");
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedStatic([CombinatorialValues("class", "struct", "record", "record struct", "record class")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
@@ -409,8 +408,7 @@ class C {
         public async Task TestNotAfterDelegate()
             => await VerifyAbsenceAsync(@"delegate $$");
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedAbstract([CombinatorialValues("class", "struct", "record", "record struct", "record class", "interface")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
@@ -419,8 +417,7 @@ await VerifyAbsenceAsync(declarationKind + """
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedVirtual([CombinatorialValues("class", "struct", "record", "record struct", "record class", "interface")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
@@ -429,8 +426,7 @@ await VerifyAbsenceAsync(declarationKind + """
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedSealed([CombinatorialValues("class", "struct", "record", "record struct", "record class", "interface")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/AsyncKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/AsyncKeywordRecommenderTests.cs
index 5c38244fda792..3637abd1754a3 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/AsyncKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/AsyncKeywordRecommenderTests.cs
@@ -330,8 +330,7 @@ class Goo
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/8616")]
         [CompilerTrait(CompilerFeature.LocalFunctions)]
         public async Task TestLocalFunction(bool topLevelStatement)
@@ -340,8 +339,7 @@ await VerifyKeywordAsync(AddInsideMethod(
 @"$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/14525")]
         [CompilerTrait(CompilerFeature.LocalFunctions)]
         public async Task TestLocalFunction2(bool topLevelStatement)
@@ -350,8 +348,7 @@ await VerifyKeywordAsync(AddInsideMethod(
 @"unsafe $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/14525")]
         [CompilerTrait(CompilerFeature.LocalFunctions)]
         public async Task TestLocalFunction3(bool topLevelStatement)
@@ -360,8 +357,7 @@ await VerifyKeywordAsync(AddInsideMethod(
 @"unsafe $$ void L() { }", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/8616")]
         [CompilerTrait(CompilerFeature.LocalFunctions)]
         public async Task TestLocalFunction4(bool topLevelStatement)
@@ -388,8 +384,7 @@ public void M(Action<int> a)
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/8616")]
         [CompilerTrait(CompilerFeature.LocalFunctions)]
         public async Task TestLocalFunction6(bool topLevelStatement)
@@ -398,8 +393,7 @@ await VerifyAbsenceAsync(AddInsideMethod(
 @"int $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/8616")]
         [CompilerTrait(CompilerFeature.LocalFunctions)]
         public async Task TestLocalFunction7(bool topLevelStatement)
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/BoolKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/BoolKeywordRecommenderTests.cs
index 866847d12f019..a78023a3bf842 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/BoolKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/BoolKeywordRecommenderTests.cs
@@ -80,8 +80,7 @@ class C {
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInFixedStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -118,80 +117,70 @@ ref readonly $$
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterConstInStatementContext(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"const $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefInStatementContext(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefReadonlyInStatementContext(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref readonly $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterConstLocalDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"const $$ int local;", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefLocalDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref $$ int local;", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefReadonlyLocalDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref readonly $$ int local;", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefLocalFunction(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref $$ int Function();", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefReadonlyLocalFunction(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref readonly $$ int Function();", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefExpression(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref int x = ref $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInEmptyStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -205,32 +194,28 @@ await VerifyAbsenceAsync(
 @"enum E : $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInGenericType1(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"IList<$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInGenericType2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"IList<int,$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInGenericType3(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"IList<int[],$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInGenericType4(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -251,16 +236,14 @@ await VerifyKeywordAsync(
 @"class C : IList<$$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterIs(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var v = goo is $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterAs(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -462,40 +445,35 @@ await VerifyKeywordAsync(AddInsideMethod(
 @"$$"));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInForVariableDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"for ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInForeachVariableDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"foreach ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInUsingVariableDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"using ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInFromVariableDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var q = from $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInJoinVariableDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -688,24 +666,21 @@ public static explicit operator $$
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterNewInExpression(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"new $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInCastType(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var str = (($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInCastType2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/BreakKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/BreakKeywordRecommenderTests.cs
index 8180b95c8b630..df8d0e5d4b264 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/BreakKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/BreakKeywordRecommenderTests.cs
@@ -62,16 +62,14 @@ await VerifyAbsenceAsync(
 @"global using Goo = $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestEmptyStatement(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
 @"$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestBeforeStatement(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -81,8 +79,7 @@ await VerifyAbsenceAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterStatement(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -92,8 +89,7 @@ await VerifyAbsenceAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBlock(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -104,8 +100,7 @@ await VerifyAbsenceAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterIf(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -115,8 +110,7 @@ await VerifyAbsenceAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterDo(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -126,8 +120,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterWhile(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -137,8 +130,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterFor(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -148,8 +140,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterForeach(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -159,8 +150,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotInsideLambda(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -171,8 +161,7 @@ await VerifyAbsenceAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotInsideAnonymousMethod(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -183,8 +172,7 @@ await VerifyAbsenceAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInsideSwitch(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -195,8 +183,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotInsideSwitchWithLambda(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -208,8 +195,7 @@ await VerifyAbsenceAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInsideSwitchOutsideLambda(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -222,8 +208,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterBreak(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -241,16 +226,14 @@ class C
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterYield(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"yield $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterSwitchInSwitch(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -263,8 +246,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBlockInSwitch(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/ByKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/ByKeywordRecommenderTests.cs
index 9dcd29142e9d5..ac83a46d0a660 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/ByKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/ByKeywordRecommenderTests.cs
@@ -62,16 +62,14 @@ await VerifyAbsenceAsync(
 @"global using Goo = $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotInEmptyStatement(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
 @"$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterGroupExpr(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -81,8 +79,7 @@ group a $$
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterGroup(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -92,8 +89,7 @@ await VerifyAbsenceAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterBy(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/ByteKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/ByteKeywordRecommenderTests.cs
index e7bad362e794d..76d43d6604003 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/ByteKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/ByteKeywordRecommenderTests.cs
@@ -80,8 +80,7 @@ class C {
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInFixedStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -95,16 +94,14 @@ await VerifyKeywordAsync(
 @"public delegate $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInCastType(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var str = (($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInCastType2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -141,80 +138,70 @@ ref readonly $$
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterConstInStatementContext(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"const $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefInStatementContext(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefReadonlyInStatementContext(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref readonly $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterConstLocalDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"const $$ int local;", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefLocalDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref $$ int local;", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefReadonlyLocalDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref readonly $$ int local;", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefLocalFunction(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref $$ int Function();", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefReadonlyLocalFunction(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref readonly $$ int Function();", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRefExpression(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"ref int x = ref $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInEmptyStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -228,32 +215,28 @@ await VerifyKeywordAsync(
 @"enum E : $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInGenericType1(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"IList<$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInGenericType2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"IList<int,$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInGenericType3(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"IList<int[],$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInGenericType4(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -274,16 +257,14 @@ await VerifyKeywordAsync(
 @"class C : IList<$$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterIs(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var v = goo is $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterAs(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -478,48 +459,42 @@ class C {
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInLocalVariableDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInForVariableDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"for ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInForeachVariableDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"foreach ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInUsingVariableDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"using ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInFromVariableDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var q = from $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInJoinVariableDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -712,8 +687,7 @@ class C {
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterNewInExpression(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/ConstKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/ConstKeywordRecommenderTests.cs
index 1a9cc1a0add15..e596353323c25 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/ConstKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/ConstKeywordRecommenderTests.cs
@@ -62,8 +62,7 @@ await VerifyAbsenceAsync(
 @"global using Goo = $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInEmptyStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/ExternKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/ExternKeywordRecommenderTests.cs
index 36112d2d92601..926fdf0a23e98 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/ExternKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/ExternKeywordRecommenderTests.cs
@@ -62,32 +62,28 @@ await VerifyAbsenceAsync(
 @"global using Goo = $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInEmptyStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterStaticInStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"static $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterAttributesInStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"[Attr] $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterAttributesInSwitchCase(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -101,16 +97,14 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterAttributesAndStaticInStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"[Attr] static $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestBetweenAttributesAndReturnStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -121,8 +115,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestBetweenAttributesAndLocalDeclarationStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -133,8 +126,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestBetweenAttributesAndAwaitExpression(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -145,8 +137,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestBetweenAttributesAndAssignmentStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -157,8 +148,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestBetweenAttributesAndCallStatement1(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -169,8 +159,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestBetweenAttributesAndCallStatement2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -182,8 +171,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterExternInStatement(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/ForEachKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/ForEachKeywordRecommenderTests.cs
index fe3cbbec68f50..59abfab56cf94 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/ForEachKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/ForEachKeywordRecommenderTests.cs
@@ -89,24 +89,21 @@ await VerifyAbsenceAsync(
 @"global using Goo = $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestEmptyStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterAwait(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"await $$", isAsync: true, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestBeforeStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -116,8 +113,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, returnType: "int", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -127,8 +123,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBlock(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -139,8 +134,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInsideForEach(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -150,8 +144,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInsideForEachInsideForEach(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -162,8 +155,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInsideForEachBlock(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -173,48 +165,42 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterForEach1(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
 @"foreach $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterForEach2(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
 @"foreach ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterForEach3(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
 @"foreach (var $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterForEach4(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
 @"foreach (var v $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterForEach5(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
 @"foreach (var v in $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterForEach6(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/NewKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/NewKeywordRecommenderTests.cs
index 3a110656e021e..2c18df41418af 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/NewKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/NewKeywordRecommenderTests.cs
@@ -63,8 +63,7 @@ await VerifyAbsenceAsync(
 @"global using Goo = $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestEmptyStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -133,16 +132,14 @@ await VerifyKeywordAsync(
 @"class C<T> where T : IGoo, $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestStartOfExpression(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var q = $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/34324")]
         public async Task TestAfterNullCoalescingAssignment(bool topLevelStatement)
         {
@@ -150,256 +147,224 @@ await VerifyKeywordAsync(AddInsideMethod(
 @"q ??= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInParenthesizedExpression(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var q = ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestPlusEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"q += $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestMinusEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"q -= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestTimesEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"q *= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestDivideEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"q /= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestModEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"q %= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestXorEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"q ^= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAndEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"q &= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestOrEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"q |= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestLeftShiftEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"q <<= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestRightShiftEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"q >>= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterMinus(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"- $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterPlus(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"+ $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterNot(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"! $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterTilde(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"~ $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBinaryTimes(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a * $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBinaryDivide(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a / $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBinaryMod(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a % $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBinaryPlus(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a + $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBinaryMinus(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a - $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBinaryLeftShift(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a << $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBinaryRightShift(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a >> $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBinaryLessThan(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a < $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBinaryGreaterThan(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a > $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterEqualsEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a == $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterNotEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a != $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterLessThanEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a <= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterGreaterThanEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a >= $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterNullable(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"a ?? $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterArrayRankSpecifier1(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"new int[ $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterArrayRankSpecifier2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"new int[expr, $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterConditional1(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -415,104 +380,91 @@ await VerifyKeywordAsync(AddInsideMethod(
 @"a ? expr | $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInArgument1(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"Goo( $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInArgument2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"Goo(expr, $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInArgument3(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"new Goo( $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInArgument4(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"new Goo(expr, $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterRef(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"Goo(ref $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterOut(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"Goo(out $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestLambda(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"Action<int> a = i => $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInCollectionInitializer1(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"new System.Collections.Generic.List<int>() { $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInCollectionInitializer2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"new System.Collections.Generic.List<int>() { expr, $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInForeachIn(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"foreach (var v in $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInAwaitForeachIn(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"await foreach (var v in $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInFromIn(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var q = from x in $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInJoinIn(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -522,8 +474,7 @@ join a in $$
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInJoinOn(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -533,8 +484,7 @@ join a in b on $$
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInJoinEquals(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -544,8 +494,7 @@ join a in b on equals $$
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestWhere(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -555,8 +504,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestOrderby1(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -566,8 +514,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestOrderby2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -577,8 +524,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestOrderby3(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -588,8 +534,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterSelect(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -599,8 +544,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterGroup(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -610,8 +554,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterGroupBy(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -621,16 +564,14 @@ group expr by $$
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterReturn(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"return $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterYieldReturn(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -644,56 +585,49 @@ await VerifyAbsenceAsync(
 @"[return $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterThrow(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"throw $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInWhile(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"while ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInUsing(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"using ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInAwaitUsing(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"await using ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInLock(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"lock ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInIf(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"if ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInSwitch(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/RefKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/RefKeywordRecommenderTests.cs
index 0d44c741d7a28..87a557f70e647 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/RefKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/RefKeywordRecommenderTests.cs
@@ -410,48 +410,42 @@ void Goo() {
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInLambdaDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var q = ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInLambdaDeclaration2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var q = (ref int a, $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInLambdaDeclaration3(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var q = (int a, $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInDelegateDeclaration(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var q = delegate ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInDelegateDeclaration2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"var q = delegate (a, $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInDelegateDeclaration3(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -472,64 +466,56 @@ void main(out goo) { }
             await VerifyKeywordAsync(text);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestEmptyStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"$$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterReturn(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"return $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInFor(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"for ($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotInFor(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
 @"for (var $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInFor2(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"for ($$;", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInFor3(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @"for ($$;;", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterVar(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
 @"var $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotInUsing(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -709,8 +695,7 @@ await VerifyKeywordAsync(
 @"delegate $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterAnonymousDelegate(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -789,8 +774,7 @@ class C {
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInUnsafeBlock(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -853,16 +837,14 @@ class C {
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInLocalArrowMethod(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
 @" ref int Goo() => $$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInArrowLambda(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -909,8 +891,7 @@ await VerifyKeywordAsync(AddInsideMethod(
 
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestRefInFor(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod("""
@@ -918,8 +899,7 @@ await VerifyKeywordAsync(AddInsideMethod("""
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestRefForeachVariable(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod("""
@@ -927,8 +907,7 @@ await VerifyKeywordAsync(AddInsideMethod("""
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestRefExpressionInAssignment(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod("""
@@ -938,8 +917,7 @@ await VerifyKeywordAsync(AddInsideMethod("""
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestRefExpressionAfterReturn(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod("""
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/SealedKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/SealedKeywordRecommenderTests.cs
index ffd1743e5f6e0..641033c2e02fa 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/SealedKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/SealedKeywordRecommenderTests.cs
@@ -363,8 +363,7 @@ public async Task TestNotAfterSealed()
         public async Task TestNotAfterStatic()
             => await VerifyAbsenceAsync(@"static $$");
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedStatic([CombinatorialValues("class", "struct", "record", "record struct", "record class")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
@@ -396,8 +395,7 @@ class C {
         public async Task TestNotAfterDelegate()
             => await VerifyAbsenceAsync(@"delegate $$");
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedAbstract([CombinatorialValues("class", "struct", "record", "record struct", "record class", "interface")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
@@ -406,8 +404,7 @@ await VerifyAbsenceAsync(declarationKind + """
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedVirtual([CombinatorialValues("class", "struct", "record", "record struct", "record class", "interface")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
@@ -426,8 +423,7 @@ class C {
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedSealed([CombinatorialValues("class", "struct", "record", "record struct", "record class", "interface")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/StaticKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/StaticKeywordRecommenderTests.cs
index 7c8545e96266d..44c3182d827bc 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/StaticKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/StaticKeywordRecommenderTests.cs
@@ -420,8 +420,7 @@ public async Task TestNotBetweenGlobalUsings_02()
             //await VerifyWorkerAsync(source, absent: true, Options.Script);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedAbstract([CombinatorialValues("class", "struct", "record", "record struct", "record class")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
@@ -439,8 +438,7 @@ interface C {
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedVirtual([CombinatorialValues("class", "struct", "record", "record struct", "record class")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
@@ -458,8 +456,7 @@ interface C {
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedOverride([CombinatorialValues("class", "struct", "record", "record struct", "record class", "interface")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
@@ -468,8 +465,7 @@ await VerifyAbsenceAsync(declarationKind + """
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedStatic([CombinatorialValues("class", "struct", "record", "record struct", "record class", "interface")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
@@ -478,8 +474,7 @@ await VerifyAbsenceAsync(declarationKind + """
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedSealed([CombinatorialValues("class", "struct", "record", "record struct", "record class")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/UsingKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/UsingKeywordRecommenderTests.cs
index ff10c3c05a795..4eb3b4193992c 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/UsingKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/UsingKeywordRecommenderTests.cs
@@ -56,8 +56,7 @@ await VerifyKeywordAsync(SourceCodeKind.Script,
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInEmptyStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -329,8 +328,7 @@ await VerifyAbsenceAsync(SourceCodeKind.Script,
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestBeforeStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -340,8 +338,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterStatement(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -351,8 +348,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterBlock(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -363,8 +359,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterIf(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -374,8 +369,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterDo(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -385,8 +379,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterWhile(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -396,8 +389,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterFor(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -407,8 +399,7 @@ await VerifyKeywordAsync(AddInsideMethod(
                 """, topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAfterForeach(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/VirtualKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/VirtualKeywordRecommenderTests.cs
index 536ceced01b0f..c7e5cb44a1e2d 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/VirtualKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/VirtualKeywordRecommenderTests.cs
@@ -281,8 +281,7 @@ public async Task TestNotAfterSealed()
         public async Task TestNotAfterStatic()
             => await VerifyAbsenceAsync(@"static $$");
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterNestedStatic([CombinatorialValues("class", "struct", "record", "record struct", "record class")] string declarationKind)
         {
             await VerifyAbsenceAsync(declarationKind + """
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/VoidKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/VoidKeywordRecommenderTests.cs
index 67c4ee21ab9af..9fbb3a1effe27 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/VoidKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/VoidKeywordRecommenderTests.cs
@@ -87,24 +87,21 @@ await VerifyKeywordAsync(
 @"public delegate $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotInCastType(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
 @"var str = (($$", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotInCastType2(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
 @"var str = (($$)items) as string;", topLevelStatement: topLevelStatement), options: CSharp9ParseOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInTypeOf(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
@@ -455,8 +452,7 @@ await VerifyKeywordAsync(
 @"delegate $$");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestNotAfterAnonymousDelegate(bool topLevelStatement)
         {
             await VerifyAbsenceAsync(AddInsideMethod(
@@ -500,8 +496,7 @@ class C {
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestInUnsafeBlock(bool topLevelStatement)
         {
             await VerifyKeywordAsync(AddInsideMethod(
diff --git a/src/EditorFeatures/Test/Diagnostics/AnalyzerLoadFailureTests.cs b/src/EditorFeatures/Test/Diagnostics/AnalyzerLoadFailureTests.cs
index 1dd3916cba97b..02be79c9261c3 100644
--- a/src/EditorFeatures/Test/Diagnostics/AnalyzerLoadFailureTests.cs
+++ b/src/EditorFeatures/Test/Diagnostics/AnalyzerLoadFailureTests.cs
@@ -10,8 +10,7 @@ namespace Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics
 {
     public class AnalyzerLoadFailureTests
     {
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void CanCreateDiagnosticForAnalyzerLoadFailure(
             AnalyzerLoadFailureEventArgs.FailureErrorCode errorCode,
             [CombinatorialValues(LanguageNames.CSharp, LanguageNames.VisualBasic, null)] string? languageName)
diff --git a/src/EditorFeatures/Test/EditAndContinue/EditAndContinueWorkspaceServiceTests.cs b/src/EditorFeatures/Test/EditAndContinue/EditAndContinueWorkspaceServiceTests.cs
index 4f0e0ea175216..6bc4b1c231ac1 100644
--- a/src/EditorFeatures/Test/EditAndContinue/EditAndContinueWorkspaceServiceTests.cs
+++ b/src/EditorFeatures/Test/EditAndContinue/EditAndContinueWorkspaceServiceTests.cs
@@ -473,8 +473,7 @@ private static string GetGeneratedCodeFromMarkedSource(string markedSource)
             return null;
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task StartDebuggingSession_CapturingDocuments(bool captureAllDocuments)
         {
             var encodingA = Encoding.BigEndianUnicode;
@@ -664,8 +663,7 @@ public async Task DifferentDocumentWithSameContent()
             }, _telemetryLog);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task ProjectThatDoesNotSupportEnC(bool breakMode)
         {
             using var _ = CreateWorkspace(out var solution, out var service, [typeof(NoCompilationLanguageService)]);
@@ -770,8 +768,7 @@ public async Task DesignTimeOnlyDocument_Dynamic()
             Assert.Empty(emitDiagnostics);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DesignTimeOnlyDocument_Wpf([CombinatorialValues(LanguageNames.CSharp, LanguageNames.VisualBasic)] string language, bool delayLoad, bool open, bool designTimeOnlyAddedAfterSessionStarts)
         {
             var source = "class A { }";
@@ -874,8 +871,7 @@ public async Task DesignTimeOnlyDocument_Wpf([CombinatorialValues(LanguageNames.
             EndDebuggingSession(debuggingSession);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task ErrorReadingModuleFile(bool breakMode)
         {
             // module file is empty, which will cause a read error:
@@ -1067,8 +1063,7 @@ public async Task ErrorReadingSourceFile()
             }, _telemetryLog);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FileAdded(bool breakMode)
         {
             var sourceA = "class C1 { void M() { System.Console.WriteLine(1); } }";
@@ -1153,8 +1148,7 @@ public async Task FileAdded(bool breakMode)
         /// solution
         /// </code>
         /// </summary>
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task ModuleDisallowsEditAndContinue_NoChanges(bool breakMode)
         {
             var source0 = "class C1 { void M() { System.Console.WriteLine(0); } }";
@@ -1365,8 +1359,7 @@ public async Task Encodings()
             EndDebuggingSession(debuggingSession);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task RudeEdits(bool breakMode)
         {
             var source1 = "class C1 { void M() { System.Console.WriteLine(1); } }";
@@ -1541,8 +1534,7 @@ class C { int Y => 2; }
             EndDebuggingSession(debuggingSession);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task RudeEdits_DocumentOutOfSync(bool breakMode)
         {
             var source0 = "class C1 { void M() { System.Console.WriteLine(0); } }";
@@ -1908,8 +1900,7 @@ public enum DocumentKind
             AnalyzerConfig,
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task HasChanges_Documents(DocumentKind documentKind)
         {
             using var _ = CreateWorkspace(out var solution, out var service);
@@ -2159,8 +2150,7 @@ public async Task Project_Add()
             EndDebuggingSession(debuggingSession);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Capabilities(bool breakState)
         {
             var source1 = "class C { void M() { } }";
@@ -2629,8 +2619,7 @@ public async Task ValidSignificantChange_AddedFileNotObservedBeforeDebuggingSess
             EndDebuggingSession(debuggingSession);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task ValidSignificantChange_DocumentOutOfSync(bool delayLoad)
         {
             var sourceOnDisk = "class C1 { void M() { System.Console.WriteLine(1); } }";
@@ -2683,8 +2672,7 @@ public async Task ValidSignificantChange_DocumentOutOfSync(bool delayLoad)
             Assert.Empty(debuggingSession.GetTestAccessor().GetModulesPreparedForUpdate());
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task ValidSignificantChange_EmitSuccessful(bool breakMode, bool commitUpdate)
         {
             var sourceV1 = "class C1 { void M() { System.Console.WriteLine(1); } }";
@@ -3608,8 +3596,7 @@ public async Task ActiveStatements()
             AssertEx.Equal(new[] { adjustedActiveLineSpan1, adjustedActiveLineSpan2 }, currentSpans.Select(s => s.LineSpan));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task ActiveStatements_SyntaxErrorOrOutOfSyncDocument(bool isOutOfSync)
         {
             var sourceV1 = "class C { void F() => G(1); void G(int a) => System.Console.WriteLine(1); }";
@@ -3673,8 +3660,7 @@ public async Task ActiveStatements_SyntaxErrorOrOutOfSyncDocument(bool isOutOfSy
             AssertEx.Equal(new[] { activeLineSpan11, activeLineSpan12 }, currentSpans.Select(s => s.LineSpan));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task ActiveStatements_ForeignDocument(bool withPath, bool designTimeOnly)
         {
             using var _ = CreateWorkspace(out var solution, out var service, [typeof(NoCompilationLanguageService)]);
diff --git a/src/EditorFeatures/Test/InheritanceMargin/InheritanceMarginTests.cs b/src/EditorFeatures/Test/InheritanceMargin/InheritanceMarginTests.cs
index 3722290e27ff0..ee20b82e5bc9d 100644
--- a/src/EditorFeatures/Test/InheritanceMargin/InheritanceMarginTests.cs
+++ b/src/EditorFeatures/Test/InheritanceMargin/InheritanceMarginTests.cs
@@ -897,8 +897,7 @@ public class {{|target1:Bar2|}} : Bar
                 itemForEooInAbstractClass);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public Task TestCSharpOverrideMemberCanFindImplementingInterface(bool testDuplicate, TestHost testHost)
         {
             var markup1 = @"using System;
@@ -1822,8 +1821,7 @@ End Sub
                 itemForFooInBar);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public Task TestVisualBasicOverrideMemberCanFindImplementingInterface(bool testDuplicate, TestHost testHost)
         {
             var markup1 = @"
diff --git a/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs b/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs
index 8ad25a41f096b..242a6957d8ee0 100644
--- a/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs
+++ b/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs
@@ -17,8 +17,7 @@ public class CSharpValueTrackingTests : AbstractBaseValueTrackingTests
         protected override TestWorkspace CreateWorkspace(string code, TestComposition composition)
             => TestWorkspace.CreateCSharp(code, composition: composition);
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestProperty(TestHost testHost)
         {
             var code =
@@ -51,8 +50,7 @@ await ValidateItemsAsync(
                 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestPropertyWithThis(TestHost testHost)
         {
             var code =
@@ -85,8 +83,7 @@ await ValidateItemsAsync(
                 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestField(TestHost testHost)
         {
             var code =
@@ -119,8 +116,7 @@ await ValidateItemsAsync(
                 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestFieldWithThis(TestHost testHost)
         {
             var code =
@@ -153,8 +149,7 @@ await ValidateItemsAsync(
                 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestLocal(TestHost testHost)
         {
             var code =
@@ -181,8 +176,7 @@ public int Add(int x, int y)
             ValidateItem(initialItems[1], 5);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestParameter(TestHost testHost)
         {
             var code =
@@ -208,8 +202,7 @@ public int Add(int $$x, int y)
             ValidateItem(initialItems[1], 3);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestMissingOnMethod(TestHost testHost)
         {
             var code =
@@ -227,8 +220,7 @@ class C
             Assert.Empty(initialItems);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestMissingOnClass(TestHost testHost)
         {
             var code =
@@ -246,8 +238,7 @@ public int Add(int x, int y)
             Assert.Empty(initialItems);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestMissingOnNamespace(TestHost testHost)
         {
             var code =
@@ -268,8 +259,7 @@ public int Add(int x, int y)
             Assert.Empty(initialItems);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task MethodTracking1(TestHost testHost)
         {
             var code =
@@ -379,8 +369,7 @@ private string CalculateDefault(C c)
             }
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task MethodTracking2(TestHost testHost)
         {
             var code =
@@ -547,8 +536,7 @@ public static void Main(string[] args)
             await ValidateChildrenEmptyAsync(workspace, items[4]);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task MethodTracking3(TestHost testHost)
         {
             var code =
@@ -622,8 +610,7 @@ public async Task<int> Double(int x)
                 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task OutParam(TestHost testHost)
         {
             var code = @"
@@ -694,8 +681,7 @@ void M()
             await ValidateChildrenEmptyAsync(workspace, children.Single());
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestVariableReferenceStart(TestHost testHost)
         {
             var code =
@@ -757,8 +743,7 @@ public static int GetM()
             await ValidateChildrenEmptyAsync(workspace, items.Single());
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestVariableReferenceStart2(TestHost testHost)
         {
             var code =
@@ -820,8 +805,7 @@ public static int GetM()
             await ValidateChildrenEmptyAsync(workspace, items.Single());
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestVariableReferenceStart3(TestHost testHost)
         {
             var code =
@@ -890,8 +874,7 @@ public static int GetM()
             await ValidateChildrenEmptyAsync(workspace, items.Single());
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestMultipleDeclarators(TestHost testHost)
         {
             var code =
@@ -960,8 +943,7 @@ public static int GetM()
             await ValidateChildrenEmptyAsync(workspace, items.Single());
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestIndex(TestHost testHost)
         {
             var code =
@@ -1010,8 +992,7 @@ public int M(Test localTest)
             await ValidateChildrenEmptyAsync(workspace, items[3]);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestPropertyValue(TestHost testHost)
         {
             var code =
diff --git a/src/EditorFeatures/Test/ValueTracking/VisualBasicValueTrackingTests.cs b/src/EditorFeatures/Test/ValueTracking/VisualBasicValueTrackingTests.cs
index 76a0905c2ff4b..1a58d63cb0789 100644
--- a/src/EditorFeatures/Test/ValueTracking/VisualBasicValueTrackingTests.cs
+++ b/src/EditorFeatures/Test/ValueTracking/VisualBasicValueTrackingTests.cs
@@ -17,8 +17,7 @@ public class VisualBasicValueTrackingTests : AbstractBaseValueTrackingTests
         protected override TestWorkspace CreateWorkspace(string code, TestComposition composition)
             => TestWorkspace.CreateVisualBasic(code, composition: composition);
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestProperty(TestHost testHost)
         {
             var code =
@@ -58,8 +57,7 @@ End Class
             ValidateItem(initialItems[1], 3);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestPropertyValue(TestHost testHost)
         {
             var code =
@@ -110,8 +108,7 @@ End Class
             await ValidateChildrenEmptyAsync(workspace, childItems.Single());
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestField(TestHost testHost)
         {
             var code =
@@ -146,8 +143,7 @@ await ValidateItemsAsync(
                 });
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestLocal(TestHost testHost)
         {
             var code =
@@ -174,8 +170,7 @@ End Class
             ValidateItem(initialItems[1], 3);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestParameter(TestHost testHost)
         {
             var code =
@@ -201,8 +196,7 @@ End Class
             ValidateItem(initialItems[1], 2);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestVariableReferenceStart(TestHost testHost)
         {
             var code =
@@ -261,8 +255,7 @@ End Function
             await ValidateChildrenEmptyAsync(workspace, items.Single());
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestVariableReferenceStart2(TestHost testHost)
         {
             var code =
@@ -321,8 +314,7 @@ End Function
             await ValidateChildrenEmptyAsync(workspace, items.Single());
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestMultipleDeclarators(TestHost testHost)
         {
             var code =
diff --git a/src/EditorFeatures/Test2/Diagnostics/GenerateFromUsage/GenerateMethodCrossLanguageTests.vb b/src/EditorFeatures/Test2/Diagnostics/GenerateFromUsage/GenerateMethodCrossLanguageTests.vb
index 95485abcafc9f..fab1f2fd4f734 100644
--- a/src/EditorFeatures/Test2/Diagnostics/GenerateFromUsage/GenerateMethodCrossLanguageTests.vb
+++ b/src/EditorFeatures/Test2/Diagnostics/GenerateFromUsage/GenerateMethodCrossLanguageTests.vb
@@ -518,8 +518,7 @@ End Module]]>
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
         Public Async Function GenerateMethodUsingTypeConstraint_2BaseTypeConstraints() As Task
             Dim input =
         <Workspace>
@@ -588,8 +587,7 @@ End Module]]>
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
         Public Async Function GenerateMethodUsingTypeConstraint_2BaseTypeConstraints_Interfaces() As Task
             Dim input =
         <Workspace>
@@ -658,8 +656,7 @@ End Module]]>
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
         Public Async Function GenerateMethodUsingTypeConstraint_3BaseTypeConstraints_NoCommonDerived() As Task
             Dim input =
         <Workspace>
@@ -827,8 +824,7 @@ End Module]]>
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
         Public Async Function GenerateMethodUsingTypeConstraint_3BaseTypeConstraints_CommonDerivedNestedType() As Task
             Dim input =
         <Workspace>
@@ -912,8 +908,7 @@ End Module]]>
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
         Public Async Function GenerateMethodUsingTypeConstraint_3BaseTypeConstraints_CommonDerivedInstantiatedTypes() As Task
             Dim input =
         <Workspace>
@@ -1004,8 +999,7 @@ End Module]]>
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608827")>
         Public Async Function GenerateMethodUsingTypeConstraint_InstantiatedGenerics() As Task
             Dim input =
         <Workspace>
diff --git a/src/EditorFeatures/Test2/FindReferences/FindReferencesTests.LinkedFiles.vb b/src/EditorFeatures/Test2/FindReferences/FindReferencesTests.LinkedFiles.vb
index c06edae96258f..696404de123f3 100644
--- a/src/EditorFeatures/Test2/FindReferences/FindReferencesTests.LinkedFiles.vb
+++ b/src/EditorFeatures/Test2/FindReferences/FindReferencesTests.LinkedFiles.vb
@@ -190,8 +190,7 @@ public class D : [|$$C|]
             Return TestAPIAndFeature(input, kind, host)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/53067")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/53067")>
         Public Async Function TestLinkedFiles_NamespaceInMetadataAndSource() As Task
             Dim definition =
 <Workspace>
@@ -229,8 +228,7 @@ namespace {|Definition:System|}
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/53067")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/53067")>
         Public Async Function TestLinkedFiles_LocalSymbol() As Task
             Dim definition =
 <Workspace>
@@ -269,8 +267,7 @@ namespace {|Definition:System|}
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/57235")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/57235")>
         Public Async Function TestLinkedFiles_OverrideMethods_DirectCall_MultiTargetting1() As Task
             Dim definition =
 <Workspace>
@@ -312,8 +309,7 @@ class D
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/57235")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/57235")>
         Public Async Function TestLinkedFiles_OverrideMethods_DirectCall_MultiTargetting2() As Task
             Dim definition =
 <Workspace>
@@ -355,8 +351,7 @@ class D
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/57235")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/57235")>
         Public Async Function TestLinkedFiles_OverrideMethods_IndirectCall_MultiTargetting1() As Task
             Dim definition =
 <Workspace>
@@ -398,8 +393,7 @@ class D
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/57235")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/57235")>
         Public Async Function TestLinkedFiles_OverrideMethods_IndirectCall_MultiTargetting2() As Task
             Dim definition =
 <Workspace>
diff --git a/src/EditorFeatures/Test2/GoToDefinition/CSharpGoToDefinitionTests.vb b/src/EditorFeatures/Test2/GoToDefinition/CSharpGoToDefinitionTests.vb
index 5f09f4a3b8077..af34b5fed0fbe 100644
--- a/src/EditorFeatures/Test2/GoToDefinition/CSharpGoToDefinitionTests.vb
+++ b/src/EditorFeatures/Test2/GoToDefinition/CSharpGoToDefinitionTests.vb
@@ -84,8 +84,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.GoToDefinition
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/3589")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/3589")>
         Public Async Function TestCSharpGoToDefinitionOnAnonymousMember() As Task
             Dim workspace =
 <Workspace>
@@ -214,8 +213,7 @@ class Program
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/900438")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/900438")>
         Public Async Function TestCSharpGotoDefinitionPartialMethod() As Task
             Dim workspace =
 <Workspace>
@@ -576,8 +574,7 @@ class Program
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538765")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538765")>
         Public Async Function TestCSharpGotoDefinitionThroughOddlyNamedType() As Task
             Dim workspace =
 <Workspace>
@@ -647,8 +644,7 @@ class Program
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542004")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542004")>
         Public Async Function TestCSharpTestLambdaParameter() As Task
             Dim workspace =
 <Workspace>
@@ -857,8 +853,7 @@ class C
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/41870")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/41870")>
         Public Async Function TestCSharpGoToImplementedInterfaceMemberFromImpl1() As Task
             Dim workspace =
 <Workspace>
@@ -880,8 +875,7 @@ class Foo : IFoo1
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/41870")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/41870")>
         Public Async Function TestCSharpGoToImplementedInterfaceMemberFromImpl2() As Task
             Dim workspace =
 <Workspace>
@@ -903,8 +897,7 @@ class Foo : IFoo1
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/41870")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/41870")>
         Public Async Function TestCSharpGoToImplementedInterfaceMemberFromImpl3() As Task
             Dim workspace =
 <Workspace>
@@ -927,8 +920,7 @@ class Foo : IFoo1, IFoo2
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/51615")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/51615")>
         Public Async Function TestCSharpGoToDefinitionInVarPatterns() As Task
             Dim workspace =
 <Workspace>
@@ -1278,8 +1270,7 @@ namespace System
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545324")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545324")>
         Public Async Function TestCSharpFilterGotoDefResultsFromHiddenCodeForUIPresenters() As Task
             Dim workspace =
 <Workspace>
@@ -1299,8 +1290,7 @@ namespace System
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545324")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545324")>
         Public Async Function TestCSharpDoNotFilterGotoDefResultsFromHiddenCodeForApis() As Task
             Dim workspace =
 <Workspace>
@@ -1555,8 +1545,7 @@ namespace System
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/989476")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/989476")>
         Public Async Function TestCSharpDoNotFilterGeneratedSourceLocations() As Task
             Dim workspace =
 <Workspace>
@@ -1580,8 +1569,7 @@ partial class [|C|]
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/989476")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/989476")>
         Public Async Function TestCSharpUseGeneratedSourceLocationsIfNoNongeneratedLocationsAvailable() As Task
             Dim workspace =
 <Workspace>
@@ -1641,8 +1629,7 @@ unsafe
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542220")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542220")>
         Public Async Function TestCSharpTestAliasAndTarget1() As Task
             Dim workspace =
 <Workspace>
@@ -1670,8 +1657,7 @@ class Program
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542220")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542220")>
         Public Async Function TestCSharpTestAliasAndTarget2() As Task
             Dim workspace =
 <Workspace>
@@ -1699,8 +1685,7 @@ class Program
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542220")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542220")>
         Public Async Function TestCSharpTestAliasAndTarget3() As Task
             Dim workspace =
 <Workspace>
@@ -1728,8 +1713,7 @@ class Program
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542220")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542220")>
         Public Async Function TestCSharpTestAliasAndTarget4() As Task
             Dim workspace =
 <Workspace>
@@ -1777,8 +1761,7 @@ class Program
             Await TestAsync(workspace, expectedResult:=False)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546341")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546341")>
         Public Async Function TestGoToDefinitionOnGlobalKeyword() As Task
             Dim workspace =
 <Workspace>
@@ -1856,8 +1839,7 @@ namespace QueryPattern
             Throw New InvalidOperationException("Highlight not found")
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQuerySelect() As Task
             Dim workspace =
 <Workspace>
@@ -1887,8 +1869,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryWhere() As Task
             Dim workspace =
 <Workspace>
@@ -1919,8 +1900,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQuerySelectMany1() As Task
             Dim workspace =
 <Workspace>
@@ -1951,8 +1931,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQuerySelectMany2() As Task
             Dim workspace =
 <Workspace>
@@ -1983,8 +1962,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryJoin1() As Task
             Dim workspace =
 <Workspace>
@@ -2015,8 +1993,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryJoin2() As Task
             Dim workspace =
 <Workspace>
@@ -2047,8 +2024,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryJoin3() As Task
             Dim workspace =
 <Workspace>
@@ -2079,8 +2055,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryJoin4() As Task
             Dim workspace =
 <Workspace>
@@ -2111,8 +2086,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryGroupJoin1() As Task
             Dim workspace =
 <Workspace>
@@ -2143,8 +2117,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryGroupJoin2() As Task
             Dim workspace =
 <Workspace>
@@ -2175,8 +2148,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryGroupJoin3() As Task
             Dim workspace =
 <Workspace>
@@ -2207,8 +2179,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryGroupJoin4() As Task
             Dim workspace =
 <Workspace>
@@ -2239,8 +2210,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryGroupBy1() As Task
             Dim workspace =
 <Workspace>
@@ -2270,8 +2240,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryGroupBy2() As Task
             Dim workspace =
 <Workspace>
@@ -2301,8 +2270,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryFromCast1() As Task
             Dim workspace =
 <Workspace>
@@ -2332,8 +2300,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryFromCast2() As Task
             Dim workspace =
 <Workspace>
@@ -2363,8 +2330,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryJoinCast1() As Task
             Dim workspace =
 <Workspace>
@@ -2395,8 +2361,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryJoinCast2() As Task
             Dim workspace =
 <Workspace>
@@ -2427,8 +2392,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQuerySelectManyCast1() As Task
             Dim workspace =
 <Workspace>
@@ -2459,8 +2423,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQuerySelectManyCast2() As Task
             Dim workspace =
 <Workspace>
@@ -2491,8 +2454,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryOrderBySingleParameter() As Task
             Dim workspace =
 <Workspace>
@@ -2523,8 +2485,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryOrderBySingleParameterWithOrderClause() As Task
             Dim workspace =
 <Workspace>
@@ -2555,8 +2516,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryOrderByTwoParameterWithoutOrderClause() As Task
             Dim workspace =
 <Workspace>
@@ -2587,8 +2547,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryOrderByTwoParameterWithOrderClause() As Task
             Dim workspace =
 <Workspace>
@@ -2619,8 +2578,7 @@ class Test
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryDegeneratedSelect() As Task
             Dim workspace =
 <Workspace>
@@ -2651,8 +2609,7 @@ class Test
             Await TestAsync(workspace, False)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/pull/23049")>
         Public Async Function TestQueryLet() As Task
             Dim workspace =
 <Workspace>
diff --git a/src/EditorFeatures/Test2/GoToDefinition/VisualBasicGoToDefinitionTests.vb b/src/EditorFeatures/Test2/GoToDefinition/VisualBasicGoToDefinitionTests.vb
index d933d5d92c03a..3e0549be8d262 100644
--- a/src/EditorFeatures/Test2/GoToDefinition/VisualBasicGoToDefinitionTests.vb
+++ b/src/EditorFeatures/Test2/GoToDefinition/VisualBasicGoToDefinitionTests.vb
@@ -9,8 +9,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.GoToDefinition
         Inherits GoToDefinitionTestsBase
 #Region "Normal Visual Basic Tests"
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/3589")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/3589")>
         Public Async Function TestVisualBasicGoToDefinitionOnAnonymousMember() As Task
             Dim workspace =
 <Workspace>
@@ -79,8 +78,7 @@ end class
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541105")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541105")>
         Public Async Function TestVisualBasicPropertyBackingField() As Task
             Dim workspace =
 <Workspace>
@@ -211,8 +209,7 @@ End Class
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/900438")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/900438")>
         Public Async Function TestVisualBasicGotoDefinitionPartialMethod() As Task
             Dim workspace =
 <Workspace>
@@ -287,8 +284,7 @@ End Class
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542872")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542872")>
         Public Async Function TestVisualBasicMe() As Task
             Dim workspace =
 <Workspace>
@@ -321,8 +317,7 @@ End Class
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542872")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542872")>
         Public Async Function TestVisualBasicMyClass() As Task
             Dim workspace =
 <Workspace>
@@ -355,8 +350,7 @@ End Class
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542872")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542872")>
         Public Async Function TestVisualBasicMyBase() As Task
             Dim workspace =
 <Workspace>
@@ -481,8 +475,7 @@ End Class
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545324")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545324")>
         Public Async Function TestVisualBasicFilterGotoDefResultsFromHiddenCodeForUIPresenters() As Task
             Dim workspace =
 <Workspace>
@@ -502,8 +495,7 @@ End Class
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545324")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545324")>
         Public Async Function TestVisualBasicDoNotFilterGotoDefResultsFromHiddenCodeForApis() As Task
             Dim workspace =
 <Workspace>
@@ -576,8 +568,7 @@ End Module]]>]
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543218")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543218")>
         Public Async Function TestVisualBasicQueryRangeVariable() As Task
             Dim workspace =
 <Workspace>
@@ -600,8 +591,7 @@ End Module
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529060")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529060")>
         Public Async Function TestVisualBasicGotoConstant() As Task
             Dim workspace =
 <Workspace>
@@ -621,8 +611,7 @@ End Module
         End Function
 
         <WorkItem("https://github.com/dotnet/roslyn/issues/10132")>
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545661")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545661")>
         Public Async Function TestCrossLanguageParameterizedPropertyOverride() As Task
             Dim workspace =
 <Workspace>
@@ -653,8 +642,7 @@ class B : A
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/866094")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/866094")>
         Public Async Function TestCrossLanguageNavigationToVBModuleMember() As Task
             Dim workspace =
 <Workspace>
@@ -703,8 +691,7 @@ class C
             Await TestAsync(workspace, expectedResult:=False)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/902119")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/902119")>
         Public Async Function TestGoToDefinitionOnInferredFieldInitializer() As Task
             Dim workspace =
 <Workspace>
@@ -730,8 +717,7 @@ End Class
             Await TestAsync(workspace)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/885151")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/885151")>
         Public Async Function TestGoToDefinitionGlobalImportAlias() As Task
             Dim workspace =
 <Workspace>
diff --git a/src/EditorFeatures/Test2/InlineHints/CSharpInlineParameterNameHintsTests.vb b/src/EditorFeatures/Test2/InlineHints/CSharpInlineParameterNameHintsTests.vb
index ee40db8abbdf7..ae22b2ce65d06 100644
--- a/src/EditorFeatures/Test2/InlineHints/CSharpInlineParameterNameHintsTests.vb
+++ b/src/EditorFeatures/Test2/InlineHints/CSharpInlineParameterNameHintsTests.vb
@@ -678,8 +678,7 @@ class Derived : Base
             Await VerifyParamHints(input, output)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestNotOnEnableDisableBoolean1() As Task
             Dim input =
             <Workspace>
@@ -703,8 +702,7 @@ class A
             Await VerifyParamHints(input, input)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestNotOnEnableDisableBoolean2() As Task
             Dim input =
             <Workspace>
@@ -753,8 +751,7 @@ class A
             Await VerifyParamHints(input, input)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestOnEnableDisableNonBoolean1() As Task
             Dim input =
             <Workspace>
@@ -797,8 +794,7 @@ class A
             Await VerifyParamHints(input, output)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestOnEnableDisableNonBoolean2() As Task
             Dim input =
             <Workspace>
@@ -841,8 +837,7 @@ class A
             Await VerifyParamHints(input, output)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestOnSetMethodWithClearContext() As Task
             Dim input =
             <Workspace>
@@ -866,8 +861,7 @@ class A
             Await VerifyParamHints(input, input)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestOnSetMethodWithUnclearContext() As Task
             Dim input =
             <Workspace>
@@ -910,8 +904,7 @@ class A
             Await VerifyParamHints(input, output)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestMethodWithAlphaSuffix1() As Task
             Dim input =
             <Workspace>
@@ -935,8 +928,7 @@ class A
             Await VerifyParamHints(input, input)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestMethodWithNonAlphaSuffix1() As Task
             Dim input =
             <Workspace>
@@ -979,8 +971,7 @@ class A
             Await VerifyParamHints(input, output)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestMethodWithNumericSuffix1() As Task
             Dim input =
             <Workspace>
@@ -1004,8 +995,7 @@ class A
             Await VerifyParamHints(input, input)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestMethodWithNonNumericSuffix1() As Task
             Dim input =
             <Workspace>
diff --git a/src/EditorFeatures/Test2/InlineHints/VisualBasicInlineParameterNameHintsTests.vb b/src/EditorFeatures/Test2/InlineHints/VisualBasicInlineParameterNameHintsTests.vb
index 365096f1be8ff..67523c1b53e57 100644
--- a/src/EditorFeatures/Test2/InlineHints/VisualBasicInlineParameterNameHintsTests.vb
+++ b/src/EditorFeatures/Test2/InlineHints/VisualBasicInlineParameterNameHintsTests.vb
@@ -587,8 +587,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InlineHints
             Await VerifyParamHints(input, output)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestNotOnEnableDisableBoolean1() As Task
             Dim input =
             <Workspace>
@@ -609,8 +608,7 @@ end class
             Await VerifyParamHints(input, input)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestNotOnEnableDisableBoolean2() As Task
             Dim input =
             <Workspace>
@@ -631,8 +629,7 @@ end class
             Await VerifyParamHints(input, input)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestOnEnableDisableNonBoolean1() As Task
             Dim input =
             <Workspace>
@@ -669,8 +666,7 @@ end class
             Await VerifyParamHints(input, output)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestOnEnableDisableNonBoolean2() As Task
             Dim input =
             <Workspace>
@@ -707,8 +703,7 @@ end class
             Await VerifyParamHints(input, output)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestOnSetMethodWithClearContext() As Task
             Dim input =
             <Workspace>
@@ -729,8 +724,7 @@ end class
             Await VerifyParamHints(input, input)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestOnSetMethodWithUnclearContext() As Task
             Dim input =
             <Workspace>
@@ -767,8 +761,7 @@ end class
             Await VerifyParamHints(input, output)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestMethodWithAlphaSuffix1() As Task
             Dim input =
             <Workspace>
@@ -789,8 +782,7 @@ end class
             Await VerifyParamHints(input, input)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestMethodWithNonAlphaSuffix1() As Task
             Dim input =
             <Workspace>
@@ -826,8 +818,7 @@ end class
             Await VerifyParamHints(input, output)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestMethodWithNumericSuffix1() As Task
             Dim input =
             <Workspace>
@@ -848,8 +839,7 @@ end class
             Await VerifyParamHints(input, input)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/47597")>
         Public Async Function TestMethodWithNonNumericSuffix1() As Task
             Dim input =
             <Workspace>
diff --git a/src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb b/src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
index 9d605373797f3..05c519f9c5846 100644
--- a/src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
+++ b/src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
@@ -7979,8 +7979,7 @@ namespace NS
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/67081")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("https://github.com/dotnet/roslyn/issues/67081")>
         <InlineData("System", True)>
         <InlineData("System.Collections", True)>
         <InlineData("SystemNamespace", False)>
diff --git a/src/EditorFeatures/Test2/IntelliSense/SignatureHelpControllerTests.vb b/src/EditorFeatures/Test2/IntelliSense/SignatureHelpControllerTests.vb
index b8e430e8bb1a3..7f0bf0c1ead54 100644
--- a/src/EditorFeatures/Test2/IntelliSense/SignatureHelpControllerTests.vb
+++ b/src/EditorFeatures/Test2/IntelliSense/SignatureHelpControllerTests.vb
@@ -209,8 +209,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
             GetMocks(controller).PresenterSession.Verify(Sub(p) p.SelectNextItem(), Times.Once)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/1181")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/1181")>
         Public Sub UpAndDownKeysShouldStillNavigateWhenDuplicateItemsAreFiltered()
             Dim item = CreateItems(1).Single()
             Dim controller = CreateController(CreateWorkspace(), items:={item, item}, waitForPresentation:=True)
diff --git a/src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests.vb b/src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests.vb
index 91bce7c96b290..90a10e6bd54b0 100644
--- a/src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests.vb
+++ b/src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests.vb
@@ -25,8 +25,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
     <Trait(Traits.Feature, Traits.Features.Completion)>
     Public Class VisualBasicCompletionCommandHandlerTests
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546208")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546208")>
         Public Async Function MultiWordKeywordCommitBehavior() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -43,8 +42,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546208")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546208")>
         Public Async Function MultiWordKeywordCommitBehavior2() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -133,8 +131,7 @@ End Module
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546432")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546432")>
         Public Sub ImplementsCompletionFaultTolerance()
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -148,8 +145,7 @@ End Module
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/5487")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/5487")>
         Public Async Function TestCommitCharTypedAtTheBeginingOfTheFilterSpan() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                   <Document><![CDATA[
@@ -191,8 +187,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543497")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543497")>
         Public Async Function CompletionDismissedAfterEscape1() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <document>
@@ -211,8 +206,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543497")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543497")>
         Public Async Function TestEnterOnSoftSelection1() As Task
             ' Code must be left-aligned because of https://github.com/dotnet/roslyn/issues/27988
             Using state = TestStateFactory.CreateVisualBasicTestState(
@@ -659,8 +653,7 @@ End Module]]></Document>)
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/287")>
-        <WpfFact> Public Async Function NotEnumPreselectionAfterBackspace() As Task
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/287")> Public Async Function NotEnumPreselectionAfterBackspace() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                   <Document><![CDATA[
 Enum E
@@ -679,8 +672,7 @@ End Class]]></Document>)
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543496")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543496")>
         Public Async Function TestNumericLiteralWithNoMatch() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                   <Document>
@@ -708,8 +700,7 @@ End Module</Document>.NormalizedValue, state.GetDocumentText())
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543496")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543496")>
         Public Async Function TestNumericLiteralWithPartialMatch() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                   <Document>
@@ -739,8 +730,7 @@ End Module</Document>.NormalizedValue, state.GetDocumentText())
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543496")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543496")>
         Public Async Function TestNumbersAfterLetters() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                   <Document>
@@ -802,8 +792,7 @@ end class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543669")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543669")>
         Public Async Function TestDeleteWordToLeft() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -820,8 +809,7 @@ end class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543617")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543617")>
         Public Async Function TestCompletionGenericWithOpenParen() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -838,8 +826,7 @@ end class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543617")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543617")>
         Public Async Function TestCompletionGenericWithSpace() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -900,8 +887,7 @@ end class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544190")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544190")>
         Public Async Function DoNotInsertEqualsForNamedParameterCommitWithColon() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                             <Document>
@@ -921,8 +907,7 @@ end class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544190")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544190")>
         Public Async Function DoInsertEqualsForNamedParameterCommitWithSpace() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                             <Document>
@@ -943,8 +928,7 @@ end class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544150")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544150")>
         Public Async Function ConsumeHashForPreprocessorCompletion() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                             <Document>
@@ -1009,8 +993,7 @@ End Class
             End Function
         End Class
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544297")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544297")>
         Public Async Function TestVerbatimNamedIdentifierFiltering() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -1030,8 +1013,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544299")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544299")>
         Public Async Function TestExclusiveNamedParameterCompletion() As Task
             Using state = TestStateFactory.CreateTestStateFromWorkspace(
                       <Workspace>
@@ -1059,8 +1041,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544299")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544299")>
         Public Async Function TestExclusiveNamedParameterCompletion2() As Task
             Using state = TestStateFactory.CreateTestStateFromWorkspace(
                       <Workspace>
@@ -1095,8 +1076,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544471")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544471")>
         Public Async Function TestDoNotCrashOnEmptyParameterList() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -1108,8 +1088,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544628")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544628")>
         Public Async Function OnlyMatchOnLowercaseIfPrefixWordMatch() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -1124,8 +1103,7 @@ End Module
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544989")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544989")>
         Public Async Function MyBaseFinalize() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -1142,8 +1120,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/551117")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/551117")>
         Public Async Function TestNamedParameterSortOrder() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -1163,8 +1140,7 @@ End Module
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546810")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546810")>
         Public Async Function TestLineContinuationCharacter() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -1182,8 +1158,7 @@ End Module
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/547287")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/547287")>
         Public Async Function TestNumberDismissesCompletion() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -1301,8 +1276,7 @@ End Module          </text>.NormalizedValue, state.GetDocumentText(), StringComp
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/622957")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/622957")>
         Public Async Function TestBangFiltersInDocComment() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                   <Document><![CDATA[
@@ -1569,8 +1543,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/674422")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/674422")>
         Public Async Function BackspaceInvokeCompletionComesUpEvenIfNoMatches() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -1588,8 +1561,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/674366")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/674366")>
         Public Async Function BackspaceCompletionSelects() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -1606,8 +1578,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/675555")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/675555")>
         Public Async Function BackspaceCompletionNeverFilters() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -1659,8 +1630,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/669942")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/669942")>
         Public Async Function DistinguishItemsWithDifferentGlyphs() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -1697,8 +1667,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/672474")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/672474")>
         Public Async Function TestInvokeSnippetCommandDismissesCompletion() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>$$</Document>)
@@ -1710,8 +1679,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/672474")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/672474")>
         Public Async Function TestSurroundWithCommandDismissesCompletion() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>$$</Document>)
@@ -1723,8 +1691,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/716117")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/716117")>
         Public Async Function XmlCompletionNotTriggeredOnBackspaceInText() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document><![CDATA[
@@ -1740,8 +1707,7 @@ End Class]]></Document>)
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/716117")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/716117")>
         Public Async Function XmlCompletionNotTriggeredOnBackspaceInTag() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document><![CDATA[
@@ -1758,8 +1724,7 @@ End Class]]></Document>)
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/674415")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/674415")>
         Public Async Function BackspacingLastCharacterDismisses() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>$$</Document>)
@@ -1771,8 +1736,7 @@ End Class]]></Document>)
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/719977")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/719977")>
         Public Async Function HardSelectionWithBuilderAndOneExactMatch() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
 <Document>Module M
@@ -1786,8 +1750,7 @@ End Module</Document>)
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/828603")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/828603")>
         Public Async Function SoftSelectionWithBuilderAndNoExactMatch() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
 <Document>Module M
@@ -1803,8 +1766,7 @@ End Module</Document>)
 
         ' The test verifies the CommitCommandHandler isolated behavior which does not add '()' after 'Main'.
         ' The integrated VS behavior for the case is to get 'Main()'.
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/792569")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/792569")>
         Public Sub CommitOnEnter()
             Dim expected = <Document>Module M
     Sub Main()
@@ -1877,8 +1839,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546208")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546208")>
         Public Async Function SelectKeywordFirst() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -1902,8 +1863,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/828392")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/828392")>
         Public Async Function ConstructorFiltersAsNew() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -1963,8 +1923,7 @@ End Class</Document>)
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/883295")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/883295")>
         Public Async Function InsertOfOnSpace() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -1983,8 +1942,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/883295")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/883295")>
         Public Sub DoNotInsertOfOnTab()
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -2002,8 +1960,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/899414")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/899414")>
         Public Async Function NotInPartialMethodDeclaration() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -2080,8 +2037,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/916452")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/916452")>
         Public Async Function SoftSelectedWithNoFilterText() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -2116,8 +2072,7 @@ End Class</Document>)
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/951726")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/951726")>
         Public Async Function DismissUponSave() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2133,8 +2088,7 @@ End Class]]></Document>)
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/969794")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/969794")>
         Public Async Function DeleteCompletionInvokedSelectedAndUnfiltered() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2151,8 +2105,7 @@ End Class
         End Function
 
         <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/871755")>
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/954556")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/954556")>
         Public Async Function FilterPrefixOnlyOnBackspace1() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2168,8 +2121,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/969040")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/969040")>
         Public Async Function BackspaceTriggerOnlyIfOptionEnabled() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2186,8 +2138,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/957450")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/957450")>
         Public Async Function KeywordsForIntrinsicsDeduplicated() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2206,8 +2157,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/957450")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/957450")>
         Public Async Function KeywordDeduplicationLeavesEscapedIdentifiers() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2228,8 +2178,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/957450")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/957450")>
         Public Async Function TestEscapedItemCommittedWithCloseBracket() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2247,8 +2196,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1075298")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1075298")>
         Public Sub CommitOnQuestionMarkForConditionalAccess()
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2264,8 +2212,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/1659")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/1659")>
         Public Async Function DismissOnSelectAllCommand() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2282,8 +2229,7 @@ Class C
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/3088")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/3088")>
         Public Async Function DoNotPreferParameterNames() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2302,8 +2248,7 @@ End Module]]></Document>)
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/4892")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/4892")>
         Public Async Function BooleanPreselection1() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2320,8 +2265,7 @@ End Module]]></Document>)
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/4892")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/4892")>
         Public Async Function BooleanPreselection2() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2341,8 +2285,7 @@ End Module]]></Document>)
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/4892")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/4892")>
         Public Async Function BooleanPreselection3() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -2542,8 +2485,7 @@ $"<{ VBFeaturesResources.Extension }> Function IEnumerable(Of 'a).ToArray() As '
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/11812")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/11812")>
         Public Async Function TestObjectCreationQualifiedName() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                             <Document><![CDATA[
@@ -2841,8 +2783,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/13161")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/13161")>
         Public Sub CommitGenericDoesNotInsertEllipsis()
             Using state = TestStateFactory.CreateVisualBasicTestState(
                             <Document><![CDATA[
@@ -2861,8 +2802,7 @@ End Class]]></Document>)
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/13161")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/13161")>
         Public Sub CommitGenericDoesNotInsertEllipsisCommitOnParen()
             Using state = TestStateFactory.CreateVisualBasicTestState(
                             <Document><![CDATA[
@@ -2880,8 +2820,7 @@ End Class]]></Document>)
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/13161")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/13161")>
         Public Sub CommitGenericItemDoesNotInsertEllipsisCommitOnTab()
             Using state = TestStateFactory.CreateVisualBasicTestState(
                             <Document><![CDATA[
@@ -2900,8 +2839,7 @@ End Class]]></Document>)
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/15011")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/15011")>
         Public Async Function SymbolAndObjectPreselectionUnification() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                             <Document><![CDATA[
@@ -2921,8 +2859,7 @@ End Module
             End Using
         End Function
 
-        <WorkItem("https://devdiv.visualstudio.com/DevDiv/_workitems?_a=edit&id=394863&triage=true")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://devdiv.visualstudio.com/DevDiv/_workitems?_a=edit&id=394863&triage=true")>
         Public Async Function ImplementsClause() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                             <Document><![CDATA[
@@ -2943,8 +2880,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/18785")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/18785")>
         Public Async Function BackspaceSoftSelectionIfNotPrefixMatch() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                             <Document><![CDATA[
@@ -2963,8 +2899,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/28767")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/28767")>
         Public Async Function CompletionDoesNotRemoveBracketsOnEnum() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                        <Document>
@@ -2983,8 +2918,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/30097")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/30097")>
         Public Async Function TestMRUKeepsTwoRecentlyUsedItems() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -3004,8 +2938,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/36546")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/36546")>
         Public Async Function TestDoNotDismissIfEmptyOnBackspaceIfStartedWithBackspace() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -3023,8 +2956,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/36546")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/36546")>
         Public Async Function TestDoNotDismissIfEmptyOnMultipleBackspaceIfStartedInvoke() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -3045,8 +2977,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/588")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/588")>
         Public Async Function TestMatchWithTurkishIWorkaround1() As Task
             Using New CultureContext(New Globalization.CultureInfo("tr-TR", useUserOverride:=False))
                 Using state = TestStateFactory.CreateVisualBasicTestState(
@@ -3063,8 +2994,7 @@ Class C
 
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/588")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/588")>
         Public Async Function TestMatchWithTurkishIWorkaround2() As Task
             Using New CultureContext(New Globalization.CultureInfo("tr-TR", useUserOverride:=False))
                 Using state = TestStateFactory.CreateVisualBasicTestState(
@@ -3080,8 +3010,7 @@ Class C
 
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
         Public Async Function TestMatchWithTurkishIWorkaround3() As Task
             Using New CultureContext(New Globalization.CultureInfo("tr-TR", useUserOverride:=False))
                 Using state = TestStateFactory.CreateVisualBasicTestState(
@@ -3101,8 +3030,7 @@ Class C
 
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
         Public Async Function TestMatchWithTurkishIWorkaround4() As Task
             Using New CultureContext(New Globalization.CultureInfo("tr-TR", useUserOverride:=False))
                 Using state = TestStateFactory.CreateVisualBasicTestState(
@@ -3126,8 +3054,7 @@ Class C
 
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
         Public Async Function TestMatchWithTurkishIWorkaround5() As Task
             Using New CultureContext(New Globalization.CultureInfo("tr-TR", useUserOverride:=False))
                 Using state = TestStateFactory.CreateVisualBasicTestState(
@@ -3152,8 +3079,7 @@ Class C
 
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
         Public Async Function TestMatchWithTurkishIWorkaround6() As Task
             Using New CultureContext(New Globalization.CultureInfo("tr-TR", useUserOverride:=False))
                 Using state = TestStateFactory.CreateVisualBasicTestState(
@@ -3173,8 +3099,7 @@ Class C
 
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
         Public Async Function TestMatchWithTurkishIWorkaround7() As Task
             Using New CultureContext(New Globalization.CultureInfo("tr-TR", useUserOverride:=False))
                 Using state = TestStateFactory.CreateVisualBasicTestState(
@@ -3198,8 +3123,7 @@ Class C
 
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
         Public Async Function TestMatchWithTurkishIWorkaround8() As Task
             Using New CultureContext(New Globalization.CultureInfo("tr-TR", useUserOverride:=False))
                 Using state = TestStateFactory.CreateVisualBasicTestState(
@@ -3223,8 +3147,7 @@ Class C
 
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
         Public Async Function TestMatchWithTurkishIWorkaround9() As Task
             Using New CultureContext(New Globalization.CultureInfo("tr-TR", useUserOverride:=False))
                 Using state = TestStateFactory.CreateVisualBasicTestState(
@@ -3248,8 +3171,7 @@ Class C
 
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/29938")>
         Public Async Function TestMatchWithTurkishIWorkaround10() As Task
             Using New CultureContext(New Globalization.CultureInfo("tr-TR", useUserOverride:=False))
                 Using state = TestStateFactory.CreateVisualBasicTestState(
diff --git a/src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests_XmlDoc.vb b/src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests_XmlDoc.vb
index df068451d6875..1849488ed1239 100644
--- a/src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests_XmlDoc.vb
+++ b/src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests_XmlDoc.vb
@@ -744,8 +744,7 @@ End Class
         End Function
 
         <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/623219")>
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/746919")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/746919")>
         Public Async Function CommitParam() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
@@ -1210,8 +1209,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/638653")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/638653")>
         Public Async Function AllowTypingSpace() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                 <Document><![CDATA[
diff --git a/src/EditorFeatures/Test2/IntelliSense/VisualBasicSignatureHelpCommandHandlerTests.vb b/src/EditorFeatures/Test2/IntelliSense/VisualBasicSignatureHelpCommandHandlerTests.vb
index 5f984aba41882..5bc3416d17744 100644
--- a/src/EditorFeatures/Test2/IntelliSense/VisualBasicSignatureHelpCommandHandlerTests.vb
+++ b/src/EditorFeatures/Test2/IntelliSense/VisualBasicSignatureHelpCommandHandlerTests.vb
@@ -11,8 +11,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
     <Trait(Traits.Feature, Traits.Features.SignatureHelp)>
     Public Class VisualBasicSignatureHelpCommandHandlerTests
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544551")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544551")>
         Public Async Function TestFilterOnNamedParameters1() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -50,8 +49,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544551")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544551")>
         Public Async Function TestFilterOnNamedParameters2() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
@@ -148,8 +146,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1060850")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1060850")>
         Public Async Function TestSigHelpNotDismissedAfterQuote() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document><![CDATA[
@@ -171,8 +168,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1060850")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1060850")>
         Public Async Function TestSigHelpDismissedAfterComment() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document><![CDATA[
@@ -193,8 +189,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1082128")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1082128")>
         Public Async Function TestSigHelpNotDismissedAfterSpace() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document><![CDATA[
@@ -271,8 +266,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/5174")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/5174")>
         Public Async Function DoNotShowSignatureHelpIfOptionIsTurnedOffUnlessExplicitlyInvoked() As Task
             Using state = TestStateFactory.CreateVisualBasicTestState(
                               <Document>
diff --git a/src/EditorFeatures/Test2/ReferenceHighlighting/VisualBasicReferenceHighlightingTests.vb b/src/EditorFeatures/Test2/ReferenceHighlighting/VisualBasicReferenceHighlightingTests.vb
index 7cc9edd561498..0810850f7a81b 100644
--- a/src/EditorFeatures/Test2/ReferenceHighlighting/VisualBasicReferenceHighlightingTests.vb
+++ b/src/EditorFeatures/Test2/ReferenceHighlighting/VisualBasicReferenceHighlightingTests.vb
@@ -191,8 +191,7 @@ End Module
                 </Workspace>, testHost)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/567959")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/567959")>
         <CombinatorialData>
         Public Async Function TestAccessor1(testHost As TestHost) As Task
             Dim input =
@@ -216,8 +215,7 @@ End Class
             Await VerifyHighlightsAsync(input, testHost)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/567959")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/567959")>
         <CombinatorialData>
         Public Async Function TestAccessor2(testHost As TestHost) As Task
             Dim input =
@@ -241,8 +239,7 @@ End Class
             Await VerifyHighlightsAsync(input, testHost)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/531624")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/531624")>
         <CombinatorialData>
         Public Async Function TestHighlightParameterizedPropertyParameter(testHost As TestHost) As Task
             Dim input =
diff --git a/src/EditorFeatures/Test2/Rename/RenameCommandHandlerTests.vb b/src/EditorFeatures/Test2/Rename/RenameCommandHandlerTests.vb
index b960777b00914..f764b4ef590d1 100644
--- a/src/EditorFeatures/Test2/Rename/RenameCommandHandlerTests.vb
+++ b/src/EditorFeatures/Test2/Rename/RenameCommandHandlerTests.vb
@@ -656,8 +656,7 @@ Goo f;
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/577178")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/577178")>
         <CombinatorialData, Trait(Traits.Feature, Traits.Features.Rename)>
         Public Async Function TypingInOtherFileTriggersCommit(host As RenameTestHost) As Task
             Using workspace = CreateWorkspaceWithWaiter(
@@ -714,8 +713,7 @@ Goo f;
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/577178")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/577178")>
         <CombinatorialData, Trait(Traits.Feature, Traits.Features.Rename)>
         Public Async Function TypingInOtherFileWithConflictTriggersCommit(host As RenameTestHost) As Task
             Using workspace = CreateWorkspaceWithWaiter(
diff --git a/src/EditorFeatures/Test2/Rename/RenameNonRenameableSymbols.vb b/src/EditorFeatures/Test2/Rename/RenameNonRenameableSymbols.vb
index d12abe3c8976b..270fc8854246c 100644
--- a/src/EditorFeatures/Test2/Rename/RenameNonRenameableSymbols.vb
+++ b/src/EditorFeatures/Test2/Rename/RenameNonRenameableSymbols.vb
@@ -366,8 +366,7 @@ class Program
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543969")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543969")>
         <CombinatorialData>
         Public Sub CannotRenameElementFromPreviousSubmission(host As RenameTestHost)
             Using workspace = CreateWorkspaceWithWaiter(
@@ -384,8 +383,7 @@ class Program
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/689002")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/689002")>
         <CombinatorialData>
         Public Sub CannotRenameHiddenElement(host As RenameTestHost)
             Using workspace = CreateWorkspaceWithWaiter(
@@ -405,8 +403,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/767187")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/767187")>
         <CombinatorialData>
         Public Sub CannotRenameConstructorInVb(host As RenameTestHost)
             Using workspace = CreateWorkspaceWithWaiter(
@@ -434,8 +431,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/767187")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/767187")>
         <CombinatorialData>
         Public Sub CannotRenameConstructorInVb2(host As RenameTestHost)
             Using workspace = CreateWorkspaceWithWaiter(
@@ -457,8 +453,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/767187")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/767187")>
         <CombinatorialData>
         Public Sub CannotRenameConstructorInVb3(host As RenameTestHost)
             Using workspace = CreateWorkspaceWithWaiter(
@@ -485,8 +480,7 @@ End Class
 #Region "Rename In Tuples"
 
         <WorkItem("https://github.com/dotnet/roslyn/issues/10898")>
-        <WorkItem("https://github.com/dotnet/roslyn/issues/10567")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("https://github.com/dotnet/roslyn/issues/10567")>
         <CombinatorialData>
         <CompilerTrait(CompilerFeature.Tuples)>
         Public Sub RenameTupleFiledInDeclaration(host As RenameTestHost)
@@ -538,8 +532,7 @@ namespace System
         End Sub
 
         <WorkItem("https://github.com/dotnet/roslyn/issues/10898")>
-        <WorkItem("https://github.com/dotnet/roslyn/issues/10567")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("https://github.com/dotnet/roslyn/issues/10567")>
         <CombinatorialData>
         <CompilerTrait(CompilerFeature.Tuples)>
         Public Sub RenameTupleFiledInLiteral(host As RenameTestHost)
@@ -591,8 +584,7 @@ namespace System
         End Sub
 
         <WorkItem("https://github.com/dotnet/roslyn/issues/10898")>
-        <WorkItem("https://github.com/dotnet/roslyn/issues/10567")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("https://github.com/dotnet/roslyn/issues/10567")>
         <CombinatorialData>
         <CompilerTrait(CompilerFeature.Tuples)>
         Public Sub RenameTupleFiledInFieldAccess(host As RenameTestHost)
diff --git a/src/EditorFeatures/VisualBasicTest/AddMissingImports/VisualBasicAddMissingImportsRefactoringProviderTests.vb b/src/EditorFeatures/VisualBasicTest/AddMissingImports/VisualBasicAddMissingImportsRefactoringProviderTests.vb
index a891c47e995e5..16a69892e0cb2 100644
--- a/src/EditorFeatures/VisualBasicTest/AddMissingImports/VisualBasicAddMissingImportsRefactoringProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/AddMissingImports/VisualBasicAddMissingImportsRefactoringProviderTests.vb
@@ -316,8 +316,7 @@ End Namespace
             Await TestInRegularAndScriptAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/31768")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/31768")>
         Public Async Function AddMissingImports_AddMultipleImports_NoPreviousImports() As Task
             Dim code = "
 Class C
@@ -359,8 +358,7 @@ End Namespace
             Await TestInRegularAndScriptAsync(code, expected, placeSystemNamespaceFirst:=False, separateImportDirectiveGroups:=False)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/39155")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/39155")>
         Public Async Function AddMissingImports_Extension() As Task
             Dim code = "
 Imports System.Runtime.CompilerServices
@@ -401,8 +399,7 @@ End Namespace
             Await TestInRegularAndScriptAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/39155")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/39155")>
         Public Async Function AddMissingImports_Extension_Overload() As Task
             Dim code = "
 Imports System.Runtime.CompilerServices
@@ -601,8 +598,7 @@ End Namespace
             Await TestInRegularAndScriptAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/39155")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/39155")>
         Public Async Function AddMissingImports_Extension_Select() As Task
             Dim code = "
 Imports System.Collections.Generic
@@ -647,8 +643,7 @@ End Namespace
             Await TestInRegularAndScriptAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/39155")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/39155")>
         Public Async Function AddMissingImports_Extension_Select_Overload() As Task
             Dim code = "
 Imports System.Collections.Generic
diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLineEnderTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLineEnderTests.vb
index 61edba2e6fdc9..8940d2ca9f33b 100644
--- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLineEnderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLineEnderTests.vb
@@ -32,16 +32,14 @@ $$</code>, <code>$$</code>)
 </code>)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530591")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530591")>
         Public Sub TestNamespace()
             Test(<code>Namespace NS
     $$
 End Namespace</code>, <code>Namespace NS$$</code>)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530591")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530591")>
         Public Sub TestClass()
             Test(<code>Class C
     $$
@@ -118,8 +116,7 @@ $$
 End Class</code>)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530591")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530591")>
         Public Sub TestDim_After_MalformedStatement()
             Test(<code>Class C
     Sub Method()
@@ -156,8 +153,7 @@ End Class
 </code>)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530591")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530591")>
         Public Sub TestIf_Trivia()
             Test(
 <code>
@@ -178,8 +174,7 @@ End Class
 </code>)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530591")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530591")>
         Public Sub TestIf_Trivia2()
             Test(
 <code>
@@ -200,8 +195,7 @@ End Class
 </code>)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/577920")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/577920")>
         Public Sub TestEndOfFile_SkippedToken()
             Test(
 <code>
diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb
index 645f3d1a5c20d..08d71f6ff16d4 100644
--- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb
+++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb
@@ -301,8 +301,7 @@ End Class</code>
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/5607")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/5607")>
         Public Sub TestOverTypeAfterIntegerLiteral()
             Dim code = <code>Imports System.Collections.Generic
 Class C
@@ -320,8 +319,7 @@ End Class</code>
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/5607")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/5607")>
         Public Sub TestOverTypeAfterDateLiteral()
             Dim code = <code>Class C
     Sub Method()
diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticEndConstructCorrection/AutomaticEndConstructCorrectorTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticEndConstructCorrection/AutomaticEndConstructCorrectorTests.vb
index 2e73bf13e8324..1eea36c4a08d4 100644
--- a/src/EditorFeatures/VisualBasicTest/AutomaticEndConstructCorrection/AutomaticEndConstructCorrectorTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/AutomaticEndConstructCorrection/AutomaticEndConstructCorrectorTests.vb
@@ -212,8 +212,7 @@ End Class</code>.Value
             VerifyContinuousEdits(code, "Shared", Function(s) "Function", removeOriginalContent:=False, split:="Function")
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539362")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539362")>
         Public Sub TestMultiLineLambdaSubToFunction()
             Dim code = <code>Class A
     Public Sub F()
@@ -228,8 +227,7 @@ End Class</code>.Value
             Verify(code, "Function")
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539362")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539362")>
         Public Sub TestMultiLineLambdaFunctionToSub()
             Dim code = <code>Class A
     Public Sub F()
@@ -243,8 +241,7 @@ End Class</code>.Value
             Verify(code, "Sub")
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539365")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539365")>
         Public Sub BugFix5290()
             Dim code = <code>Public Class Class1
     Sub M()
@@ -256,8 +253,7 @@ End [|Class|]</code>.Value
             VerifyEnd(code, "Structure", "Class")
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539357")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539357")>
         Public Sub TestBugFix5276()
             Dim code = <code>Class A
     [|Func$$tion|] Test() As Integer
@@ -267,8 +263,7 @@ End Class</code>.Value
             VerifyContinuousEdits(code, "  ", Function(s) "Function", removeOriginalContent:=False)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539360")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539360")>
         Public Sub TestBugFix5283()
             Dim code = <code>Class A
     [|$$Function|] Test() As Integer
diff --git a/src/EditorFeatures/VisualBasicTest/BraceMatching/VisualBasicBraceMatcherTests.vb b/src/EditorFeatures/VisualBasicTest/BraceMatching/VisualBasicBraceMatcherTests.vb
index fc4383e1aa424..a71ffeb23e31c 100644
--- a/src/EditorFeatures/VisualBasicTest/BraceMatching/VisualBasicBraceMatcherTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/BraceMatching/VisualBasicBraceMatcherTests.vb
@@ -372,8 +372,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.BraceMatching
             Await TestInClassAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
         Public Async Function TestConditionalDirectiveWithSingleMatchingDirective() As Task
             Dim code =
 <Text>Class C
@@ -397,8 +396,7 @@ End Class
             Await TestAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
         Public Async Function TestConditionalDirectiveWithTwoMatchingDirectives() As Task
             Dim code =
 <Text>Class C
@@ -422,8 +420,7 @@ End Class
             Await TestAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
         Public Async Function TestConditionalDirectiveWithAllMatchingDirectives() As Task
             Dim code =
 <Text>Class C
@@ -449,8 +446,7 @@ End Class
             Await TestAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
         Public Async Function TestRegionDirective() As Task
             Dim code =
 <Text>Class C
@@ -472,8 +468,7 @@ End Class
             Await TestAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
         Public Async Function TestInterleavedDirectivesInner() As Task
             Dim code =
 <Text>#Const CHK = True
@@ -509,8 +504,7 @@ End Module
             Await TestAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
         Public Async Function TestInterleavedDirectivesOuter() As Task
             Dim code =
 <Text>#Const CHK = True
@@ -546,8 +540,7 @@ End Module
             Await TestAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
         Public Async Function TestUnmatchedDirective1() As Task
             Dim code =
 <Text>Class C
@@ -568,8 +561,7 @@ End Class
             Await TestAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/7120")>
         Public Async Function TestUnmatchedDirective2() As Task
             Dim code =
 <Text>
@@ -592,8 +584,7 @@ End Class
             Await TestAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/7534")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/7534")>
         Public Async Function TestUnmatchedIncompleteConditionalDirective() As Task
             Dim code =
 <Text>
@@ -615,8 +606,7 @@ End Class
             Await TestAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/7534")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/7534")>
         Public Async Function TestUnmatchedCompleteConditionalDirective() As Task
             Dim code =
 <Text>
@@ -638,8 +628,7 @@ End Class
             Await TestAsync(code, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/7534")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/7534")>
         Public Async Function TestUnmatchedConditionalDirective() As Task
             Dim code =
 <Text>
diff --git a/src/EditorFeatures/VisualBasicTest/CaseCorrecting/CaseCorrectionServiceTests.vb b/src/EditorFeatures/VisualBasicTest/CaseCorrecting/CaseCorrectionServiceTests.vb
index 61accc89cc76e..da3fe27a072e4 100644
--- a/src/EditorFeatures/VisualBasicTest/CaseCorrecting/CaseCorrectionServiceTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/CaseCorrecting/CaseCorrectionServiceTests.vb
@@ -111,8 +111,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542058")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542058")>
         Public Async Function TestConstructorNew1() As Task
             Dim input = <Code>
 Class C
@@ -139,8 +138,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542058")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542058")>
         Public Async Function TestConstructorNew2() As Task
             Dim input = <Code>
 Class B
@@ -175,8 +173,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542058")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542058")>
         Public Async Function TestConstructorNew3() As Task
             Dim input = <Code>
 Class C
@@ -204,8 +201,7 @@ End Class
         End Function
 
         <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542058")>
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543999")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543999")>
         Public Async Function TestConstructorNew4() As Task
             Dim input = <Code>
 Class C
@@ -236,8 +232,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541352")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541352")>
         Public Async Function TestAlias1() As Task
             Dim input = <Code>
 Imports S = System.String
@@ -814,8 +809,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608626")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/608626")>
         Public Async Function TestOverloadResolutionFailure() As Task
             Dim input = <Code>
 Option Strict On
@@ -838,8 +832,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/1949")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/1949")>
         Public Async Function TestUnResolvedTypeDoesNotBindToAnyAccessibleSymbol() As Task
             Dim unchangeCode = <Code>
 Option Strict On
@@ -923,8 +916,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
         <Trait(Traits.Feature, Traits.Features.CaseCorrection)>
         Public Async Function TestCharacterTypeSuffix() As Task
             Dim input = <Code>
@@ -946,8 +938,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
         <Trait(Traits.Feature, Traits.Features.CaseCorrection)>
         Public Async Function TestULTypeSuffix() As Task
             Dim input = <Code>
@@ -971,8 +962,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
         <Trait(Traits.Feature, Traits.Features.CaseCorrection)>
         Public Async Function TestFTypeSuffix() As Task
             Dim input = <Code>
@@ -994,8 +984,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
         <Trait(Traits.Feature, Traits.Features.CaseCorrection)>
         Public Async Function TestRTypeSuffix() As Task
             Dim input = <Code>
@@ -1017,8 +1006,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
         <Trait(Traits.Feature, Traits.Features.CaseCorrection)>
         Public Async Function TestDTypeSuffix() As Task
             Dim input = <Code>
@@ -1040,8 +1028,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538930")>
         <Trait(Traits.Feature, Traits.Features.CaseCorrection)>
         Public Async Function TestDateLiteral() As Task
             Dim input = <Code>
@@ -1065,8 +1052,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539020")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539020")>
         <Trait(Traits.Feature, Traits.Features.CaseCorrection)>
         Public Async Function TestEscaping1() As Task
             Dim input = <Code>
@@ -1088,8 +1074,7 @@ End Namespace
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539020")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539020")>
         <Trait(Traits.Feature, Traits.Features.CaseCorrection)>
         Public Async Function TestEscaping2() As Task
             Dim input = <Code>
@@ -1131,8 +1116,7 @@ End Module
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539356")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539356")>
         Public Async Function TestREMInComment() As Task
             Dim input = <Code>
 rem this is a comment
@@ -1176,8 +1160,7 @@ End Module
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("https://devdiv.visualstudio.com/DevDiv/_workitems?id=397014")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://devdiv.visualstudio.com/DevDiv/_workitems?id=397014")>
         Public Async Function AvoidNodesWithSyntaxErrorsAndStringLiterals() As Task
             Dim input = <Code>
 Class C
@@ -1218,8 +1201,7 @@ End Class
 
 #Region "Preprocessor"
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539308")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539308")>
         Public Async Function TestPreprocessor() As Task
             Dim input = <Code>
 #if true then
@@ -1234,8 +1216,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539352")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539352")>
         Public Async Function TestPreprocessorLiterals() As Task
             Dim input = <Code>
 #const goo = 2.0d
@@ -1248,8 +1229,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539352")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539352")>
         Public Async Function TestPreprocessorInMethodBodies() As Task
             Dim input = <Code>
 Module Program
@@ -1272,8 +1252,7 @@ End Module
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539352")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539352")>
         Public Async Function TestPreprocessorAroundClass() As Task
             Dim input = <Code>
 #if true then
@@ -1292,8 +1271,7 @@ End Class
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539472")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539472")>
         Public Async Function TestRemCommentAfterPreprocessor() As Task
             Dim input = <Code>
 #const goo = 42 rem goo
@@ -1950,8 +1928,7 @@ End Namespace
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542110")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542110")>
         Public Async Function SkippedTokens() As Task
             Dim input =
 <Text>
@@ -1968,8 +1945,7 @@ End Namespace
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544395")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544395")>
         Public Async Function TestAttribute() As Task
             Dim input =
 <Text><![CDATA[
@@ -1996,8 +1972,7 @@ End Enum
             Await TestAsync(input, expected)
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530927")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530927")>
         Public Async Function TestNewOnRightSideOfDot() As Task
             Dim input =
 <Text><![CDATA[
diff --git a/src/EditorFeatures/VisualBasicTest/ChangeSignature/ChangeSignatureTests.vb b/src/EditorFeatures/VisualBasicTest/ChangeSignature/ChangeSignatureTests.vb
index fa7b0e8261abc..60b16b783f74e 100644
--- a/src/EditorFeatures/VisualBasicTest/ChangeSignature/ChangeSignatureTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/ChangeSignature/ChangeSignatureTests.vb
@@ -10,8 +10,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
     Partial Public Class ChangeSignatureTests
         Inherits AbstractChangeSignatureTests
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/17309")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/17309")>
         Public Async Function TestNotInLeadingWhitespace() As Task
             Dim markup = "
 class C
@@ -24,8 +23,7 @@ end class
             Await TestChangeSignatureViaCodeActionAsync(markup, expectedCodeAction:=False)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/17309")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/17309")>
         Public Async Function TestNotInLeadingTrivia1() As Task
             Dim markup = "
 class C
@@ -38,8 +36,7 @@ end class
             Await TestChangeSignatureViaCodeActionAsync(markup, expectedCodeAction:=False)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/17309")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/17309")>
         Public Async Function TestNotInLeadingTrivia2() As Task
             Dim markup = "
 class C
@@ -52,8 +49,7 @@ end class
             Await TestChangeSignatureViaCodeActionAsync(markup, expectedCodeAction:=False)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/17309")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/17309")>
         Public Async Function TestNotInLeadingAttributes1() As Task
             Dim markup = "
 class C
@@ -66,8 +62,7 @@ end class
             Await TestChangeSignatureViaCodeActionAsync(markup, expectedCodeAction:=False)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/17309")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/17309")>
         Public Async Function TestNotInLeadingAttributes2() As Task
             Dim markup = "
 class C
diff --git a/src/EditorFeatures/VisualBasicTest/CodeActions/GenerateType/GenerateTypeTests.vb b/src/EditorFeatures/VisualBasicTest/CodeActions/GenerateType/GenerateTypeTests.vb
index d6efc8e53c121..152222bb3a22f 100644
--- a/src/EditorFeatures/VisualBasicTest/CodeActions/GenerateType/GenerateTypeTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/CodeActions/GenerateType/GenerateTypeTests.vb
@@ -506,8 +506,7 @@ expectedContainers:=ImmutableArray.Create("Goo"),
 expectedDocumentName:="Bar.vb")
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/17361")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/17361")>
         Public Async Function TestPreserveBanner1() As Task
             Await TestAddDocumentInRegularAndScriptAsync(
 "' I am a banner!
@@ -528,8 +527,7 @@ expectedContainers:=ImmutableArray(Of String).Empty,
 expectedDocumentName:="Bar.vb")
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/17361")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/17361")>
         Public Async Function TestPreserveBanner2() As Task
             Await TestAddDocumentInRegularAndScriptAsync(
 "''' I am a doc comment!
@@ -550,8 +548,7 @@ expectedContainers:=ImmutableArray(Of String).Empty,
 expectedDocumentName:="Bar.vb")
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/17361")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/17361")>
         Public Async Function TestPreserveBanner3() As Task
             Await TestAddDocumentInRegularAndScriptAsync(
 "' I am a banner!
diff --git a/src/EditorFeatures/VisualBasicTest/CodeActions/GenerateType/GenerateTypeTests_Dialog.vb b/src/EditorFeatures/VisualBasicTest/CodeActions/GenerateType/GenerateTypeTests_Dialog.vb
index 03ea8f80faa20..9d71a41dfd401 100644
--- a/src/EditorFeatures/VisualBasicTest/CodeActions/GenerateType/GenerateTypeTests_Dialog.vb
+++ b/src/EditorFeatures/VisualBasicTest/CodeActions/GenerateType/GenerateTypeTests_Dialog.vb
@@ -428,8 +428,7 @@ newFileFolderContainers:=ImmutableArray(Of String).Empty,
 newFileName:="Test2.vb")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
         Public Async Function GenerateType_UsingsNotNeeded_InNewFile_InFolder() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly" CommonReferences="true">
@@ -462,8 +461,7 @@ newFileFolderContainers:=ImmutableArray.Create("outer", "inner"),
 newFileName:="Test2.vb")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/898452")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/898452")>
         Public Async Function GenerateType_InValidFolderNameNotMadeNamespace() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly" CommonReferences="true">
@@ -496,8 +494,7 @@ newFileName:="Test2.vb")
         End Function
 
         <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/907454")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/907454")>
         Public Async Function GenerateType_UsingsNeeded_InNewFile_InFolder() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly" CommonReferences="true">
@@ -535,8 +532,7 @@ newFileFolderContainers:=ImmutableArray.Create("outer", "inner"),
 newFileName:="Test2.vb")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/907454")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/907454")>
         Public Async Function GenerateType_UsingsPresentAlready_InNewFile_InFolder() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly" CommonReferences="true">
@@ -576,8 +572,7 @@ newFileFolderContainers:=ImmutableArray.Create("outer"),
 newFileName:="Test2.vb")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
         Public Async Function GenerateType_UsingsNotNeeded_InNewFile_InFolder_NotSimpleName() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly" CommonReferences="true">
@@ -744,8 +739,7 @@ projectName:="Assembly2")
         End Function
 #End Region
 #Region "SameLanguage DifferentProject NewFile"
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
         Public Async Function GenerateTypeIntoSameLanguageDifferentProjectNewFile() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
@@ -780,8 +774,7 @@ newFileFolderContainers:=ImmutableArray(Of String).Empty,
 projectName:="Assembly2")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
         Public Async Function GenerateTypeIntoSameLanguageDifferentProjectNewFile_Folders_Usings() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
@@ -823,8 +816,7 @@ newFileFolderContainers:=ImmutableArray.Create("outer", "inner"),
 projectName:="Assembly2")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
         Public Async Function GenerateTypeIntoSameLanguageDifferentProjectNewFile_Folders_NoUsings_NotSimpleName() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
@@ -861,8 +853,7 @@ newFileFolderContainers:=ImmutableArray(Of String).Empty,
 projectName:="Assembly2")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
         Public Async Function GenerateTypeIntoSameLanguageDifferentProjectNewFile_Folders_NoUsings_NotSimpleName_ProjectReference() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly2" CommonReferences="true">
@@ -940,8 +931,7 @@ newFileFolderContainers:=ImmutableArray(Of String).Empty,
 projectName:="Assembly2")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
         Public Async Function GenerateTypeIntoDifferentLanguageNewFile_Folders_Imports() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
@@ -990,8 +980,7 @@ newFileFolderContainers:=ImmutableArray.Create("outer", "inner"),
 projectName:="Assembly2")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
         Public Async Function GenerateTypeIntoDifferentLanguageNewFile_Folders_NoImports_NotSimpleName() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
@@ -1027,8 +1016,7 @@ newFileFolderContainers:=ImmutableArray.Create("outer", "inner"),
 projectName:="Assembly2")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
         Public Async Function GenerateTypeIntoDifferentLanguageNewFile_Folders_Imports_DefaultNamespace() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
@@ -1077,8 +1065,7 @@ newFileFolderContainers:=ImmutableArray.Create("outer", "inner"),
 projectName:="Assembly2")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/850101")>
         Public Async Function GenerateTypeIntoDifferentLanguageNewFile_Folders_NoImports_NotSimpleName_DefaultNamespace() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
@@ -1281,8 +1268,7 @@ existingFilename:="Test2.cs",
 projectName:="Assembly2")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/858826")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/858826")>
         Public Async Function GenerateTypeIntoDifferentLanguageNewFileAdjustTheFileExtension() As Task
             Dim markupString = <Workspace>
                                    <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
diff --git a/src/EditorFeatures/VisualBasicTest/CodeActions/MoveType/MoveTypeTests.MoveToNewFile.vb b/src/EditorFeatures/VisualBasicTest/CodeActions/MoveType/MoveTypeTests.MoveToNewFile.vb
index 1c8fe90a00b76..18ae6eaee372e 100644
--- a/src/EditorFeatures/VisualBasicTest/CodeActions/MoveType/MoveTypeTests.MoveToNewFile.vb
+++ b/src/EditorFeatures/VisualBasicTest/CodeActions/MoveType/MoveTypeTests.MoveToNewFile.vb
@@ -107,8 +107,7 @@ End Class
             Await TestMoveTypeToNewFileAsync(code, codeAfterMove, expectedDocumentName, destinationDocumentText, index:=1)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/14484")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/14484")>
         Public Async Function MoveNestedTypeToNewFile_RemoveComments() As Task
             Dim code =
 "
@@ -186,8 +185,7 @@ End Class
             Await TestMoveTypeToNewFileAsync(code, codeAfterMove, expectedDocumentName, destinationDocumentText)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/16282")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/16282")>
         Public Async Function TestTypeInheritance() As Task
             Dim code =
 "
@@ -228,8 +226,7 @@ End Class
             Await TestMoveTypeToNewFileAsync(code, codeAfterMove, expectedDocumentName, destinationDocumentText)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/21456")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/21456")>
         Public Async Function TestLeadingBlankLines1() As Task
             Dim code =
 "' Banner Text
@@ -272,8 +269,7 @@ end class
                 code, codeAfterMove, expectedDocumentName, destinationDocumentText)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/21456")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/21456")>
         Public Async Function TestLeadingBlankLines2() As Task
             Dim code =
 "' Banner Text
diff --git a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/OverrideCompletionProviderTests.vb b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/OverrideCompletionProviderTests.vb
index 212722a514f25..8f3d04fa10b09 100644
--- a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/OverrideCompletionProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/OverrideCompletionProviderTests.vb
@@ -59,8 +59,7 @@ End Class</a>
             Await VerifyItemExistsAsync(text.Value, "Goo()", "Sub Derived.Goo()")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543807")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543807")>
         Public Async Function TestHideFinalize() As Task
             Dim text = <a>Class goo
     Overrides $$
@@ -69,8 +68,7 @@ End Class</a>
             Await VerifyItemIsAbsentAsync(text.Value, "Finalize()")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543807")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543807")>
         Public Async Function TestShowShadowingFinalize() As Task
             Dim text = <a>Class goo
     Overridable Shadows Sub Finalize()
@@ -86,8 +84,7 @@ End class</a>
             Await VerifyItemIsAbsentAsync(text.Value, "goo.Finalize()")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543806")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543806")>
         Public Async Function TestShowObjectOverrides() As Task
             Dim text = <a>Class goo
     Overrides $$
@@ -514,8 +511,7 @@ End Class</a>
             Await VerifyItemIsAbsentAsync(markup.Value, "Goo(t As T, s As S)")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529714")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529714")>
         Public Async Function TestGenericMethodTypeParametersNotRenamed() As Task
             Dim text = <a>Class CGoo    
     Overridable Function Something(Of X)(arg As X) As X    
@@ -1092,8 +1088,7 @@ End Class]]></a>
             Await VerifyCustomCommitProviderAsync(markupBeforeCommit.Value.Replace(vbLf, vbCrLf), "Item(i As Integer)", expectedCode.Value.Replace(vbLf, vbCrLf))
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543937")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543937")>
         Public Async Function TestCommitOptionalKeywordAndParameterValuesAreGenerated() As Task
             Dim markupBeforeCommit = <a><![CDATA[Class CBase
     Public Overridable Sub goo(Optional x As Integer = 42)
@@ -1237,8 +1232,7 @@ End Class</a>
             Await VerifyCustomCommitProviderAsync(markupBeforeCommit.Value.Replace(vbLf, vbCrLf), "goo(Of T)(x As T)", expectedCode.Value.Replace(vbLf, vbCrLf))
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545627")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545627")>
         Public Async Function TestCommitGenericMethodOnArraySubstitutedGenericType() As Task
             Dim markupBeforeCommit = <a>Class A(Of T)
     Public Overridable Sub M(Of U As T)()
@@ -1477,8 +1471,7 @@ End Class</a>
             Await VerifyCustomCommitProviderAsync(markupBeforeCommit.Value.Replace(vbLf, vbCrLf), "goo(ByRef x As Integer, y As String)", expectedCode.Value.Replace(vbLf, vbCrLf))
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529714")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529714")>
         Public Async Function TestCommitGenericMethodTypeParametersNotRenamed() As Task
             Dim markupBeforeCommit = <a>Class CGoo    
     Overridable Function Something(Of X)(arg As X) As X    
@@ -1531,8 +1524,7 @@ End Class</a>
             Await VerifyCustomCommitProviderAsync(markupBeforeCommit.Value.Replace(vbLf, vbCrLf), "Goo()", expectedCode.Value.Replace(vbLf, vbCrLf))
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543937")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/543937")>
         Public Async Function TestOptionalArguments() As Task
             Dim markupBeforeCommit = <a>Class CBase
     Public Overridable Sub goo(Optional x As Integer = 42)
@@ -1563,8 +1555,7 @@ End Class</a>
             Await VerifyCustomCommitProviderAsync(markupBeforeCommit.Value.Replace(vbLf, vbCrLf), "goo(x As Integer = 42)", expectedCode.Value.Replace(vbLf, vbCrLf))
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/636706")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/636706")>
         Public Async Function TestParameterizedProperty() As Task
             Dim markupBeforeCommit = <a>Public Class Goo
     Public Overridable Property Bar(bay As Integer) As Integer
@@ -1610,8 +1601,7 @@ End Class</a>
             Await VerifyCustomCommitProviderAsync(markupBeforeCommit.Value.Replace(vbLf, vbCrLf), "Bar(bay As Integer)", expectedCode.Value.Replace(vbLf, vbCrLf))
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529737")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529737")>
         Public Async Function TestOverrideDefaultPropertiesByName() As Task
             Dim markupBeforeCommit = <a>Class A
     Default Overridable ReadOnly Property Goo(x As Integer) As Object
@@ -1651,8 +1641,7 @@ End Class
 
 #Region "Commit: With Trivia"
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529216")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529216")>
         Public Async Function TestCommitSurroundingTriviaDirective() As Task
             Dim markupBeforeCommit = <a>Class Base
     Public Overridable Sub Goo()
@@ -1714,8 +1703,7 @@ End Class</a>
             Await VerifyCustomCommitProviderAsync(markupBeforeCommit.Value.Replace(vbLf, vbCrLf), "Goo()", expectedCode.Value.Replace(vbLf, vbCrLf))
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529216")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529216")>
         Public Async Function TestCommitAfterTriviaDirective() As Task
             Dim markupBeforeCommit = <a>Class Base
     Public Overridable Sub Goo()
@@ -1777,8 +1765,7 @@ End Class</a>
             Await VerifyCustomCommitProviderAsync(markupBeforeCommit.Value.Replace(vbLf, vbCrLf), "Goo()", expectedCode.Value.Replace(vbLf, vbCrLf))
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529216")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529216")>
         Public Async Function TestCommitAfterComment() As Task
             Dim markupBeforeCommit = <a>Class Base
     Public Overridable Sub Goo()
@@ -1808,8 +1795,7 @@ End Class</a>
         End Function
 #End Region
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529572")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529572")>
         Public Async Function TestWitheventsFieldNotOffered() As Task
             Dim text = <a>Public Class C1
     Public WithEvents w As C1 = Me
@@ -1822,8 +1808,7 @@ End Class
             Await VerifyItemIsAbsentAsync(text.Value, "w")
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/715")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/715")>
         Public Async Function TestEventsNotOffered() As Task
             Dim text = <Workspace>
                            <Project Language="Visual Basic" CommonReferences="true">
diff --git a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SymbolCompletionProviderTests.vb b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SymbolCompletionProviderTests.vb
index ae2834a60a70a..4af4ecf9a3460 100644
--- a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SymbolCompletionProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SymbolCompletionProviderTests.vb
@@ -2635,7 +2635,7 @@ End Module
             Await VerifyItemIsAbsentAsync(markup, "[Structure]")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539450")> <Fact>
+        <Fact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539450")>
         Public Async Function TestKeywordEscaping2() As Task
             Dim markup = <Text>
 Module [Structure]
@@ -2657,7 +2657,7 @@ End Module
             Await VerifyItemIsAbsentAsync(markup, "[rem]")
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539450")> <Fact>
+        <Fact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539450")>
         Public Async Function TestKeywordEscaping3() As Task
             Dim markup = <Text>
 Namespace Goo
diff --git a/src/EditorFeatures/VisualBasicTest/DocumentationComments/DocumentationCommentTests.vb b/src/EditorFeatures/VisualBasicTest/DocumentationComments/DocumentationCommentTests.vb
index d9c95b0e266fd..da55365f986c3 100644
--- a/src/EditorFeatures/VisualBasicTest/DocumentationComments/DocumentationCommentTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/DocumentationComments/DocumentationCommentTests.vb
@@ -81,8 +81,7 @@ End Class
             VerifyTypingCharacter(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538715")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538715")>
         Public Sub TestTypingCharacter_NoReturnType()
             Const code = "
 Class C
@@ -144,8 +143,7 @@ End Class
             VerifyTypingCharacter(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537506")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537506")>
         Public Sub TestTypingCharacter_NotAfterClassName()
             Const code = "
 Class C''$$
@@ -158,8 +156,7 @@ End Class
             VerifyTypingCharacter(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537508")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537508")>
         Public Sub TestTypingCharacter_NotInsideClass()
             Const code = "
 Class C
@@ -174,8 +171,7 @@ End Class
             VerifyTypingCharacter(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537510")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537510")>
         Public Sub TestTypingCharacter_NotAfterConstructorName()
             Const code = "
 Class C
@@ -190,8 +186,7 @@ End Class
             VerifyTypingCharacter(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537511")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537511")>
         Public Sub TestTypingCharacter_NotInsideConstructor()
             Const code = "
 Class C
@@ -210,8 +205,7 @@ End Class
             VerifyTypingCharacter(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537512")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537512")>
         Public Sub TestTypingCharacter_NotInsideMethodBody()
             Const code = "
 Class C
@@ -230,8 +224,7 @@ End Class
             VerifyTypingCharacter(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540004")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540004")>
         Public Sub TestTypingCharacter_NoReturnsOnWriteOnlyProperty()
             Const code = "
 Class C
@@ -324,8 +317,7 @@ End Class
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538717")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538717")>
         Public Sub TestPressingEnter_Module()
             Const code = "
 '''$$Module M
@@ -526,8 +518,7 @@ End Class
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540017")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540017")>
         Public Sub TestPressingEnter_InsertApostrophes8()
             Const code = "
 ''' <summary></summary>$$
@@ -543,8 +534,7 @@ End Class
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/4817")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/4817")>
         Public Sub TestPressingEnter_InsertApostrophes9_AutoGenerateXmlDocCommentsOff()
             Const code = "
 ''' <summary></summary>$$
@@ -563,8 +553,7 @@ End Class
             })
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540017")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540017")>
         Public Sub TestPressingEnter_DoNotInsertApostrophes1()
             Const code = "
 ''' <summary></summary>
@@ -602,8 +591,7 @@ End Class
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537534")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537534")>
         Public Sub TestPressingEnter_NotInsideMethodBody()
             Const code = "
 Class C
@@ -623,8 +611,7 @@ End Class
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537550")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/537550")>
         Public Sub TestPressingEnter_NotBeforeDocComment()
             Const code = "
     Class c1
@@ -652,8 +639,7 @@ Public Async Function TestGoo() As Task
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2091")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2091")>
         Public Sub TestPressingEnter_InTextBeforeSpace()
             Const code = "
 Class C
@@ -677,8 +663,7 @@ End Class
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2108")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2108")>
         Public Sub TestPressingEnter_Indentation1()
             Const code = "
 Class C
@@ -702,8 +687,7 @@ End Class
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2108")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2108")>
         Public Sub TestPressingEnter_Indentation2()
             Const code = "
 Class C
@@ -727,8 +711,7 @@ End Class
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2108")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2108")>
         Public Sub TestPressingEnter_Indentation3()
             Const code = "
 Class C
@@ -752,8 +735,7 @@ End Class
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2108")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2108")>
         Public Sub TestPressingEnter_Indentation4()
             Const code = "
 Class C
@@ -777,8 +759,7 @@ End Class
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2108")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2108")>
         Public Sub TestPressingEnter_Indentation5_UseTabs()
             Const code = "
 Class C
@@ -802,8 +783,7 @@ End Class
             VerifyPressingEnter(code, expected, useTabs:=True)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/5486")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/5486")>
         Public Sub TestPressingEnter_Selection1()
             Const code = "
 ''' <summary>
@@ -823,8 +803,7 @@ End Class
             VerifyPressingEnter(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/5486")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/5486")>
         Public Sub TestPressingEnter_Selection2()
             Const code = "
 ''' <summary>
@@ -862,8 +841,7 @@ End Class
             VerifyInsertCommentCommand(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/4817")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/4817")>
         Public Sub TestCommand_Class_AutoGenerateXmlDocCommentsOff()
             Const code = "
 Class C
@@ -901,8 +879,7 @@ End Class
             VerifyInsertCommentCommand(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538715")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538715")>
         Public Sub TestCommand_Method1()
             Const code = "
 Class C
@@ -969,8 +946,7 @@ End Class
             VerifyInsertCommentCommand(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538482")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538482")>
         Public Sub TestCommand_FirstModuleOnLine()
             Const code = "
 $$Module M : End Module : Module N : End Module
@@ -985,8 +961,7 @@ Module M : End Module : Module N : End Module
             VerifyInsertCommentCommand(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538482")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538482")>
         Public Sub TestCommand_NotOnSecondModuleOnLine()
             Const code = "Module M : End Module : $$Module N : End Module"
             Const expected = "Module M : End Module : $$Module N : End Module"
@@ -994,8 +969,7 @@ Module M : End Module : Module N : End Module
             VerifyInsertCommentCommand(code, expected)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538482")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538482")>
         Public Sub TestCommand_FirstPropertyOnLine()
             Const code = "
 Module M
@@ -1014,8 +988,7 @@ End Module
             VerifyInsertCommentCommand(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
         Public Sub TestOpenLineAbove1()
             Const code = "
 Class C
@@ -1039,8 +1012,7 @@ End Class
             VerifyOpenLineAbove(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
         Public Sub TestOpenLineAbove2()
             Const code = "
 Class C
@@ -1072,8 +1044,7 @@ End Class
                                 "End Module")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
         Public Sub TestOpenLineAbove3()
             Const code = "
 Class C
@@ -1099,8 +1070,7 @@ End Class
             VerifyOpenLineAbove(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
         Public Sub TestOpenLineAbove4_Tabs()
             Const code = "
 Class C
@@ -1124,8 +1094,7 @@ End Class
             VerifyOpenLineAbove(code, expected, useTabs:=True)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
         Public Sub TestOpenLineBelow1()
             Const code = "
 Class C
@@ -1149,8 +1118,7 @@ End Class
             VerifyOpenLineBelow(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
         Public Sub TestOpenLineBelow2()
             Const code = "
 Class C
@@ -1174,8 +1142,7 @@ End Class
             VerifyOpenLineBelow(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
         Public Sub TestOpenLineBelow3()
             Const code = "
 ''' <summary>
@@ -1189,8 +1156,7 @@ End Class
             VerifyOpenLineBelow(code, expected)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/2090")>
         Public Sub TestOpenLineBelow4_Tabs()
             Const code = "
 Class C
diff --git a/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructCommandHandlerTests.vb b/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructCommandHandlerTests.vb
index 1d978446b435a..583abaf9ac0ee 100644
--- a/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructCommandHandlerTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructCommandHandlerTests.vb
@@ -110,8 +110,7 @@ End Module</code>.Value.Replace(vbLf, vbCrLf)
             VerifyAppliedAfterReturnUsingCommandHandler(code, {4, -1}, expected, {5, 8})
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/628656")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/628656")>
         Public Sub EndConstruct_NotOnLineFollowingToken()
             VerifyStatementEndConstructNotApplied(
                 text:="Class C
diff --git a/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/MethodBlockTests.vb b/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/MethodBlockTests.vb
index e85e767b237e1..02407969683d2 100644
--- a/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/MethodBlockTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/MethodBlockTests.vb
@@ -201,8 +201,7 @@ End Class",
                 caret:={2, -1})
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/528961")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/528961")>
         Public Sub TestVerifyInvalidLocation02()
             VerifyStatementEndConstructApplied(
                 before:="Sub S",
diff --git a/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/PropertyBlockTests.vb b/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/PropertyBlockTests.vb
index cab2c5e44e5e5..d8db42f7098b1 100644
--- a/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/PropertyBlockTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/PropertyBlockTests.vb
@@ -24,8 +24,7 @@ End Class",
                 caret:={1, -1})
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530329")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530329")>
         Public Sub DoNotApplyForMustInheritProperty()
             VerifyStatementEndConstructNotApplied(
                 text:="MustInherit Class C
@@ -247,8 +246,7 @@ End Class",
                 caret:={2, -1})
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/536391")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/536391")>
         Public Sub DoNotApplyForGetInReadOnly()
             VerifyStatementEndConstructNotApplied(
                 text:="Class c1
@@ -268,8 +266,7 @@ End Class",
                 caret:={1, -1})
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544197")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544197")>
         Public Sub DoNotApplyInsideAnInterface()
             VerifyStatementEndConstructNotApplied(
                 text:="Interface IGoo
diff --git a/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb b/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb
index 6db73bca2df6a..13b6f620852c6 100644
--- a/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb
@@ -1248,8 +1248,7 @@ End Class</Code>.Value
                 expectedIndentation:=26)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/536762")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/536762")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestBugFix1417_2()
             Dim code = <Code>Sub Main()
@@ -1381,8 +1380,7 @@ End Class</Code>.Value
                 expectedIndentation:=12)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539456")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539456")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestImplicitLineContinuationExpression1()
             Dim code = <Code>Class C
@@ -1400,8 +1398,7 @@ End Class</Code>.Value
                 expectedIndentation:=12)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540634")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540634")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestImplicitLineContinuationExpression2()
             Dim code = <Code>Module Program
@@ -1897,8 +1894,7 @@ End Module
 
 #Region "Bugs"
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538771")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538771")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestBugFix4481()
             Dim code = <Code>_
@@ -1910,8 +1906,7 @@ End Module
                 expectedIndentation:=4)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538771")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538771")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestBugFix4481_2()
             Dim code = <Code>  _
@@ -1923,8 +1918,7 @@ End Module
                 expectedIndentation:=6)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539553")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539553")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestBug5559()
             Dim code = <Code>Public Class Class1
@@ -1944,8 +1938,7 @@ End Class</Code>.Value
                 expectedIndentation:=8)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539575")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539575")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestBug5586()
             Dim code = <Code>Module Program
@@ -1961,8 +1954,7 @@ End Module</Code>.Value
                 expectedIndentation:=16)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539609")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539609")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestBug5629()
             Dim code = <Code>Module Module1
@@ -1980,8 +1972,7 @@ End Module</Code>.Value
                 expectedIndentation:=20)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539686")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539686")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestBug5730()
             Dim code = <Code>Module Program
@@ -1998,8 +1989,7 @@ End Module
                 expectedIndentation:=12)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539686")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539686")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestBug5730_1()
             Dim code = <Code>Module Program
@@ -2015,8 +2005,7 @@ End Module</Code>.Value
                 expectedIndentation:=20)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539639")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539639")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestBug5666()
             Dim code = <Code>Module Program
@@ -2035,8 +2024,7 @@ End Module
                 expectedIndentation:=12)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539453")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539453")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestBug5430_1()
             Dim code = My.Resources.XmlLiterals.IndentationTest2
@@ -2047,8 +2035,7 @@ End Module
                 expectedIndentation:=16)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540198")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/540198")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestBug6374()
             Dim code = <text>Imports System
@@ -2069,8 +2056,7 @@ End Module</text>.Value
                 expectedIndentation:=8)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542240")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/542240")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub TestMissingEndStatement()
             Dim code = <text>Module Module1
@@ -2957,8 +2943,7 @@ End Class
                 expectedIndentation:=12)
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38819")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38819")>
         <Trait(Traits.Feature, Traits.Features.SmartIndent)>
         Public Sub IndentationOfReturnInFileWithTabs1()
             Dim code = "
diff --git a/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormattingEngineTests.vb b/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormattingEngineTests.vb
index 75cce2d2446df..dced91769d1e0 100644
--- a/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormattingEngineTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormattingEngineTests.vb
@@ -22,8 +22,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Formatting
             }
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/25003")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/25003")>
         Public Async Function SeparateGroups_KeepMultipleLinesBetweenGroups() As Task
             Dim code = "[|
 Imports System.A
@@ -47,8 +46,7 @@ Imports MS.B
                 expected, code, baseIndentation:=0, options:=SeparateImportDirectiveGroups)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/25003")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/25003")>
         Public Async Function SeparateGroups_DoNotGroupIfNotSorted() As Task
             Dim code = "[|
 Imports System.B
@@ -68,8 +66,7 @@ Imports MS.A
                 expected, code, baseIndentation:=0, options:=SeparateImportDirectiveGroups)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/25003")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/25003")>
         Public Async Function SeparateGroups_GroupIfSorted() As Task
             Dim code = "[|
 Imports System.A
@@ -90,8 +87,7 @@ Imports MS.B
                 expected, code, baseIndentation:=0, options:=SeparateImportDirectiveGroups)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/25003")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/25003")>
         Public Async Function SeparateGroups_GroupIfSorted_RecognizeSystemNotFirst() As Task
             Dim code = "[|
 Imports MS.A
diff --git a/src/EditorFeatures/VisualBasicTest/ImplementAbstractClass/ImplementAbstractClassCommandHandlerTests.vb b/src/EditorFeatures/VisualBasicTest/ImplementAbstractClass/ImplementAbstractClassCommandHandlerTests.vb
index 49f5c03ec338b..b375830b6604a 100644
--- a/src/EditorFeatures/VisualBasicTest/ImplementAbstractClass/ImplementAbstractClassCommandHandlerTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/ImplementAbstractClass/ImplementAbstractClassCommandHandlerTests.vb
@@ -20,8 +20,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ImplementAbstractC
     <Trait(Traits.Feature, Traits.Features.CodeActionsImplementAbstractClass)>
     Public Class ImplementAbstractClassCommandHandlerTests
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530553")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530553")>
         Public Sub TestSimpleCases()
             Dim code = <text>
 Imports System
@@ -49,8 +48,7 @@ End Class</text>
              Sub(x, y) AssertEx.AssertContainsToleratingWhitespaceDifferences(x, y))
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530553")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530553")>
         Public Sub TestInvocationAfterWhitespaceTrivia()
             Dim code = <text>
 Imports System
@@ -128,8 +126,7 @@ End Class</text>
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544412")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544412")>
         Public Sub TestEnterNotOnSameLine()
             Dim code = <text>
 MustInherit Class Base
diff --git a/src/EditorFeatures/VisualBasicTest/ImplementInterface/ImplementInterfaceCommandHandlerTests.vb b/src/EditorFeatures/VisualBasicTest/ImplementInterface/ImplementInterfaceCommandHandlerTests.vb
index 9c27d29619d63..b763aeee6b18d 100644
--- a/src/EditorFeatures/VisualBasicTest/ImplementInterface/ImplementInterfaceCommandHandlerTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/ImplementInterface/ImplementInterfaceCommandHandlerTests.vb
@@ -99,8 +99,7 @@ End Interface</text>
              Sub(expected, actual, view) AssertEx.AssertContainsToleratingWhitespaceDifferences(expected, actual))
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544161")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544161")>
         Public Sub TestInterfacesWithDuplicateMember()
             Dim code = <text>
 Interface IGoo
@@ -229,8 +228,7 @@ End Class</text>
         End Sub
 
         <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530553")>
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544087")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544087")>
         Public Sub TestInvocationAfterWhitespaceTrivia()
             Dim code = <text>
 Imports System
@@ -254,8 +252,7 @@ End Interface</text>
 
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544089")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544089")>
         Public Sub TestInvocationAfterCommentTrivia()
             Dim code = <text>
 Imports System
@@ -305,8 +302,7 @@ End Interface</text>
                  Sub(expected, actual, view) Assert.Equal(expected.Trim(), actual.Trim()))
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544211")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544211")>
         Public Sub TestWithEndBlockMissing()
             Dim code = <text>
 Imports System
@@ -331,8 +327,7 @@ End Class</text>
                  Sub(expected, actual, view) AssertEx.AssertEqualToleratingWhitespaceDifferences(expected, actual))
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529302")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529302")>
         Public Sub TestWithEndBlockMissing2()
             Dim code = <text>
 Imports System
@@ -363,8 +358,7 @@ End Class</text>
 
         <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530553")>
         <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529337")>
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/674621")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/674621")>
         Public Sub TestWithStatementSeparator()
             Dim code = <text>
 Imports System
@@ -397,8 +391,7 @@ End Class
                  Sub(expected, actual, view) AssertEx.AssertEqualToleratingWhitespaceDifferences(expected, actual))
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529360")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529360")>
         Public Sub TestCursorNotOnSameLine()
             Dim code = <text>
 Imports System
@@ -432,8 +425,7 @@ End Class
                  Sub(expected, actual, view) AssertEx.AssertEqualToleratingWhitespaceDifferences(expected, actual))
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529722")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/529722")>
         Public Sub TestCursorPlacedOnBlankLineAfter()
             Dim code = <text>
 Imports System
@@ -467,8 +459,7 @@ End Class
                  End Sub)
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545867")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/545867")>
         Public Sub TestMultipleImplementationWithCaseDifference()
             Dim code = <text>
 Interface IA
@@ -503,8 +494,7 @@ End Class</text>
              Sub(expected, actual, view) AssertEx.AssertContainsToleratingWhitespaceDifferences(expected, actual))
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/927478")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/927478")>
         Public Sub TestFullyQualifiedName()
             Dim code = <text>
 Namespace N
diff --git a/src/EditorFeatures/VisualBasicTest/LineCommit/CommitWithViewTests.vb b/src/EditorFeatures/VisualBasicTest/LineCommit/CommitWithViewTests.vb
index 63757135a5786..1ce661c79a8a1 100644
--- a/src/EditorFeatures/VisualBasicTest/LineCommit/CommitWithViewTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/LineCommit/CommitWithViewTests.vb
@@ -624,8 +624,7 @@ End Module
         End Sub
 
         <WorkItem(16493, "DevDiv_Projects/Roslyn")>
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539544")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539544")>
         Public Sub TestBetterStartIndentation()
             Using testData = CommitTestData.Create(
                 <Workspace>
@@ -1012,8 +1011,7 @@ End Module
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/3119")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/3119")>
         Public Sub TestMissingThenInIf()
             Using testData = CommitTestData.Create(
                 <Workspace>
@@ -1047,8 +1045,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/3119")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/3119")>
         Public Sub TestMissingThenInElseIf()
             Using testData = CommitTestData.Create(
                 <Workspace>
diff --git a/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb b/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb
index eaf574c6bb378..5c0bb86e6608e 100644
--- a/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb
@@ -1046,8 +1046,7 @@ End Module
                 Documentation(VBWorkspaceResources.If_condition_returns_True_the_function_calculates_and_returns_expressionIfTrue_Otherwise_it_returns_expressionIfFalse))
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/957082")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/957082")>
         Public Async Function TestAddHandlerStatement() As Task
             Await TestInMethodAsync("$$AddHandler goo, bar",
                 MainDescription($"AddHandler {VBWorkspaceResources.event_}, {VBWorkspaceResources.handler}"),
@@ -1055,8 +1054,7 @@ End Module
                 SymbolGlyph(Glyph.Keyword))
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/957082")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/957082")>
         Public Async Function TestRemoveHandlerStatement() As Task
             Await TestInMethodAsync("$$RemoveHandler goo, bar",
                 MainDescription($"RemoveHandler {VBWorkspaceResources.event_}, {VBWorkspaceResources.handler}"),
@@ -1071,8 +1069,7 @@ End Module
                 Documentation(VBWorkspaceResources.Returns_a_System_Type_object_for_the_specified_type_name))
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544140")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544140")>
         Public Async Function TestGetXmlNamespaceExpression() As Task
             Await TestWithReferencesAsync(
                 <text>
diff --git a/src/EditorFeatures/VisualBasicTest/SplitComment/SplitCommentCommandHandlerTests.vb b/src/EditorFeatures/VisualBasicTest/SplitComment/SplitCommentCommandHandlerTests.vb
index 17b909cb3a123..f3616eab7a90d 100644
--- a/src/EditorFeatures/VisualBasicTest/SplitComment/SplitCommentCommandHandlerTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SplitComment/SplitCommentCommandHandlerTests.vb
@@ -15,8 +15,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SplitComment
             Return EditorTestWorkspace.CreateVisualBasic(markup)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitStartOfComment()
             TestHandled(
 "Module Program
@@ -34,8 +33,7 @@ End Module
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitStartOfDoubleComment1()
             TestHandled(
 "Module Program
@@ -53,8 +51,7 @@ End Module
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitStartOfDoubleComment2()
             TestHandled(
 "Module Program
@@ -72,8 +69,7 @@ End Module
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitStartOfDoubleComment3()
             TestHandled(
 "Module Program
@@ -91,8 +87,7 @@ End Module
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitStartOfCommentWithLeadingSpace1()
             TestHandled(
 "Module Program
@@ -110,8 +105,7 @@ End Module
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitStartOfCommentWithLeadingSpace2()
             TestHandled(
 "Module Program
@@ -129,8 +123,7 @@ End Module
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitMiddleOfComment()
             TestHandled(
 "Module Program
@@ -148,8 +141,7 @@ End Module
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitEndOfComment()
             TestNotHandled(
 "Module Program
@@ -160,8 +152,7 @@ End Module
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestNotAtEndOfFile()
             TestNotHandled(
 "Module Program
@@ -169,8 +160,7 @@ End Module
         ' Test Comment[||]")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitCommentOutOfMethod()
             TestHandled(
 "Module Program
@@ -190,8 +180,7 @@ End Module
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitCommentOutOfModule()
             TestHandled(
 "Module Program
@@ -211,8 +200,7 @@ End Module
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitCommentOutOfClass()
             TestHandled(
 "Class Program
@@ -232,8 +220,7 @@ End Class
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitCommentOutOfNamespace()
             TestHandled(
 "Namespace TestNamespace
@@ -257,8 +244,7 @@ End Namespace
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         Public Sub TestSplitCommentWithLineContinuation()
             TestNotHandled(
 "Module Program
@@ -270,8 +256,7 @@ End Module
 ")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         <InlineData("X[||]Test Comment")>
         <InlineData("X [||]Test Comment")>
         <InlineData("X[||] Test Comment")>
@@ -291,8 +276,7 @@ end class",
 end class")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
-        <WpfTheory>
+        <WpfTheory, WorkItem("https://github.com/dotnet/roslyn/issues/38516")>
         <InlineData("X[||]Test Comment")>
         <InlineData("X [||]Test Comment")>
         <InlineData("X[||] Test Comment")>
@@ -312,8 +296,7 @@ end class",
 end class")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/48547")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/48547")>
         Public Sub TestSplitWithCommentAfterwards1()
             TestNotHandled(
 "public class Program
@@ -323,8 +306,7 @@ end class")
 end class")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/48547")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/48547")>
         Public Sub TestSplitWithCommentAfterwards2()
             TestNotHandled(
 "public class Program
@@ -336,8 +318,7 @@ end class")
 end class")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/48547")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/48547")>
         Public Sub TestSplitWithCommentAfterwards3()
             TestNotHandled(
 "public class Program
@@ -348,8 +329,7 @@ end class")
 end class")
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/48547")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/48547")>
         Public Sub TestSplitWithCommentAfterwards4()
             TestNotHandled(
 "public class Program
diff --git a/src/Features/CSharpTest/ConvertIfToSwitch/ConvertIfToSwitchTests.cs b/src/Features/CSharpTest/ConvertIfToSwitch/ConvertIfToSwitchTests.cs
index 94f70ea7d34bc..ad6bd6680ee2b 100644
--- a/src/Features/CSharpTest/ConvertIfToSwitch/ConvertIfToSwitchTests.cs
+++ b/src/Features/CSharpTest/ConvertIfToSwitch/ConvertIfToSwitchTests.cs
@@ -492,8 +492,7 @@ void M(int i)
             await VerifyCS.VerifyRefactoringAsync(source, source);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestIsExpression(
             [CombinatorialValues(LanguageVersion.CSharp8, LanguageVersion.CSharp9)] LanguageVersion languageVersion)
         {
diff --git a/src/Features/CSharpTest/EditAndContinue/ActiveStatementTests.cs b/src/Features/CSharpTest/EditAndContinue/ActiveStatementTests.cs
index 78408bd6fff22..2fe58e3c168d2 100644
--- a/src/Features/CSharpTest/EditAndContinue/ActiveStatementTests.cs
+++ b/src/Features/CSharpTest/EditAndContinue/ActiveStatementTests.cs
@@ -843,8 +843,7 @@ public void Parameter_Update_TypeOrRefKind_RuntimeTypeChanged(string oldType)
                 capabilities: EditAndContinueCapabilities.AddMethodToExistingType);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Parameter_Update_RefKind_RuntimeTypeUnchanged(
             [CombinatorialValues("ref", "out", "in", "ref readonly")] string oldModifiers,
             [CombinatorialValues("ref", "out", "in", "ref readonly")] string newModifiers)
diff --git a/src/Features/CSharpTest/EditAndContinue/BreakpointSpansTests.cs b/src/Features/CSharpTest/EditAndContinue/BreakpointSpansTests.cs
index 9f31982904a00..146e2dae0d36b 100644
--- a/src/Features/CSharpTest/EditAndContinue/BreakpointSpansTests.cs
+++ b/src/Features/CSharpTest/EditAndContinue/BreakpointSpansTests.cs
@@ -4401,8 +4401,7 @@ public void InstanceConstructor_NoInitializer_Attributes()
 }");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void InstanceConstructor_Primary_ImplicitBaseInitializer_OutsideOfIdentifierAndNonEmptyParameters(
             [CombinatorialValues("class", "struct", "record", "record struct")] string keyword,
             [CombinatorialValues(
@@ -4425,8 +4424,7 @@ public void InstanceConstructor_Primary_ImplicitBaseInitializer_OutsideOfIdentif
             TestSpan(source.Replace("class", keyword));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void InstanceConstructor_Primary_ImplicitBaseInitializer_OnIdentifierOrNonEmptyParameters_NonRecord(
             [CombinatorialValues("class", "struct")] string keyword,
             [CombinatorialValues(
@@ -4443,8 +4441,7 @@ public void InstanceConstructor_Primary_ImplicitBaseInitializer_OnIdentifierOrNo
             TestSpan(source.Replace("class", keyword));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void InstanceConstructor_Primary_ImplicitBaseInitializer_OnIdentifierOrNonEmptyParameters_Record(
             [CombinatorialValues("record", "record struct")] string keyword,
             [CombinatorialValues(
@@ -4465,8 +4462,7 @@ public void InstanceConstructor_Primary_ImplicitBaseInitializer_OnIdentifierOrNo
             TestSpan(source.Replace("record", keyword));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void InstanceConstructor_Primary_ImplicitBaseInitializer_NoBreakpoint(
             [CombinatorialValues("class", "struct", "record", "record struct")] string keyword,
             [CombinatorialValues(
@@ -4481,8 +4477,7 @@ public void InstanceConstructor_Primary_ImplicitBaseInitializer_NoBreakpoint(
             TestMissing(source.Replace("class", keyword));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void InstanceConstructor_Primary_ExplicitBaseInitializer_OutsideOfIdentifierAndNonEmptyParameters(
             [CombinatorialValues("class", "struct", "record", "record struct")] string keyword,
             [CombinatorialValues(
@@ -4509,8 +4504,7 @@ public void InstanceConstructor_Primary_ExplicitBaseInitializer_OutsideOfIdentif
             TestSpan(source.Replace("class", keyword));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void InstanceConstructor_Primary_ExplicitBaseInitializer_OnIdentifierOrNonEmptyParameters_NonRecord(
             [CombinatorialValues("class", "struct")] string keyword,
             [CombinatorialValues(
@@ -4525,8 +4519,7 @@ public void InstanceConstructor_Primary_ExplicitBaseInitializer_OnIdentifierOrNo
             TestSpan(source.Replace("class", keyword));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void InstanceConstructor_Primary_ExplicitBaseInitializer_OnIdentifierOrNonEmptyParameters_Record(
             [CombinatorialValues("record", "record struct")] string keyword,
             [CombinatorialValues(
@@ -4541,8 +4534,7 @@ public void InstanceConstructor_Primary_ExplicitBaseInitializer_OnIdentifierOrNo
             TestSpan(source.Replace("record", keyword));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void InstanceConstructor_Primary_ExplicitBaseInitializer_NoBreakpoint(
             [CombinatorialValues("class", "struct", "record", "record struct")] string keyword,
             [CombinatorialValues(
diff --git a/src/Features/CSharpTest/EditAndContinue/StatementEditingTests.cs b/src/Features/CSharpTest/EditAndContinue/StatementEditingTests.cs
index aa466cf1e9c6f..147cfafd24b9a 100644
--- a/src/Features/CSharpTest/EditAndContinue/StatementEditingTests.cs
+++ b/src/Features/CSharpTest/EditAndContinue/StatementEditingTests.cs
@@ -4725,8 +4725,7 @@ public void Lambdas_Update_CeaseCapture_ConstructorInitializer_Base()
                 SemanticEdit(SemanticEditKind.Update, c => c.GetMember("C..ctor"), preserveLocalVariables: true));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Lambdas_Update_CeaseCapture_PrimaryParameter_InPrimaryConstructor_First(
             [CombinatorialValues("class", "struct", "record", "record struct")] string keyword)
         {
@@ -4739,8 +4738,7 @@ public void Lambdas_Update_CeaseCapture_PrimaryParameter_InPrimaryConstructor_Fi
                 SemanticEdit(SemanticEditKind.Update, c => c.GetMember<INamedTypeSymbol>("C").InstanceConstructors.Single(m => m.Parameters is [_, _]), preserveLocalVariables: true));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Lambdas_Update_CeaseCapture_PrimaryParameter_InPrimaryConstructor_Second(
             [CombinatorialValues("class", "struct", "record", "record struct")] string keyword)
         {
@@ -4753,8 +4751,7 @@ public void Lambdas_Update_CeaseCapture_PrimaryParameter_InPrimaryConstructor_Se
                 SemanticEdit(SemanticEditKind.Update, c => c.GetMember<INamedTypeSymbol>("C").InstanceConstructors.Single(m => m.Parameters is [_, _]), preserveLocalVariables: true));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/68731")]
         public void Lambdas_Update_CeaseCapture_PrimaryParameter_InPrimaryConstructor_BaseInitializer(
             [CombinatorialValues("class", "record")] string keyword)
@@ -5246,8 +5243,7 @@ public void Lambdas_Update_Capturing_ConstructorInitializer_Base()
                 SemanticEdit(SemanticEditKind.Update, c => c.GetMember("C..ctor"), preserveLocalVariables: true));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Lambdas_Update_Capturing_PrimaryParameter_InPrimaryConstructor_First(
             [CombinatorialValues("class", "struct", "record", "record struct")] string keyword)
         {
@@ -5260,8 +5256,7 @@ public void Lambdas_Update_Capturing_PrimaryParameter_InPrimaryConstructor_First
                 capabilities: EditAndContinueCapabilities.AddMethodToExistingType | EditAndContinueCapabilities.NewTypeDefinition);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Lambdas_Update_Capturing_PrimaryParameter_InPrimaryConstructor_Second(
             [CombinatorialValues("class", "struct", "record", "record struct")] string keyword)
         {
diff --git a/src/Features/CSharpTest/EditAndContinue/TopLevelEditingTests.cs b/src/Features/CSharpTest/EditAndContinue/TopLevelEditingTests.cs
index 9df9b818343b7..dc32458ce0022 100644
--- a/src/Features/CSharpTest/EditAndContinue/TopLevelEditingTests.cs
+++ b/src/Features/CSharpTest/EditAndContinue/TopLevelEditingTests.cs
@@ -10809,8 +10809,7 @@ public void Constructor_Parameter_AddAttribute_Record_ReplacingCustomPropertyWit
                 capabilities: EditAndContinueCapabilities.ChangeCustomAttributes);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Parameter_Update_TypeOrRefKind_RuntimeTypeChanged(
             [CombinatorialValues("int", "in byte", "ref byte", "out byte", "ref readonly byte")] string type,
             bool direction)
@@ -12915,8 +12914,7 @@ public void Constructor_Instance_Insert_ReplacingExplicitWithDefault_WithStackAl
                 ]);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Insert_UpdatingImplicit(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("public", "protected")] string accessibility)
@@ -12935,8 +12933,7 @@ public void Constructor_Instance_Insert_UpdatingImplicit(
                 capabilities: EditAndContinueCapabilities.ChangeCustomAttributes);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Insert_UpdatingImplicit_Partial(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("public", "protected")] string accessibility)
@@ -12961,8 +12958,7 @@ public void Constructor_Instance_Insert_UpdatingImplicit_Partial(
                 ]);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Insert_AddingParameterless(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("public", "internal", "private", "protected", "private protected", "internal protected")] string accessibility)
@@ -12978,8 +12974,7 @@ public void Constructor_Instance_Insert_AddingParameterless(
                 capabilities: EditAndContinueCapabilities.AddMethodToExistingType);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Insert_AddingParameterless_Primary(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("public", "internal", "private", "protected", "private protected", "internal protected")] string accessibility)
@@ -12995,8 +12990,7 @@ public void Constructor_Instance_Insert_AddingParameterless_Primary(
                 capabilities: EditAndContinueCapabilities.AddMethodToExistingType);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Insert_AddingParameterless_Partial(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("public", "internal", "private", "protected", "private protected", "internal protected")] string accessibility)
@@ -13022,8 +13016,7 @@ public void Constructor_Instance_Insert_AddingParameterless_Partial(
                 capabilities: EditAndContinueCapabilities.AddMethodToExistingType);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Insert_AddingParameterless_Partial_Primary(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("public", "internal", "private", "protected", "private protected", "internal protected")] string accessibility)
@@ -13049,8 +13042,7 @@ public void Constructor_Instance_Insert_AddingParameterless_Partial_Primary(
                 capabilities: EditAndContinueCapabilities.AddMethodToExistingType);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Insert_ReplacingSynthesizedWithCustom_ChangingAccessibilty(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("", "private", "protected", "internal", "private protected", "internal protected")] string accessibility)
@@ -13067,8 +13059,7 @@ public void Constructor_Instance_Insert_ReplacingSynthesizedWithCustom_ChangingA
                 capabilities: EditAndContinueCapabilities.Baseline);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Insert_ReplacingSynthesizedWithCustom_ChangingAccessibilty_AbstractType(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("", "private", "public", "internal", "private protected", "internal protected")] string accessibility)
@@ -13240,8 +13231,7 @@ public void Constructor_Instance_Delete_SemanticError()
                 Diagnostic(RudeEditKind.ChangingAccessibility, "class C", DeletedSymbolDisplay(FeaturesResources.constructor, "C()")));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Delete_UpdatingImplicit(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("public", "protected")] string accessibility)
@@ -13292,8 +13282,7 @@ class C
                 ]);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Delete_WithParameters([CombinatorialValues("record", "class")] string keyword)
         {
             var src1 = keyword + " C { public C(int x) { } }";
@@ -13306,8 +13295,7 @@ public void Constructor_Instance_Delete_WithParameters([CombinatorialValues("rec
                 capabilities: EditAndContinueCapabilities.Baseline);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Delete_Primary_WithParameters([CombinatorialValues("record", "class")] string keyword)
         {
             var src1 = keyword + " C(int a) { public C(bool b) { } }";
@@ -13387,8 +13375,7 @@ public void Constructor_Instance_Delete_Public_PartialWithInitializerUpdate()
                 ]);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Delete_ReplacingCustomWithSynthesized(
             [CombinatorialValues("record", "class")] string keyword)
         {
@@ -13401,8 +13388,7 @@ public void Constructor_Instance_Delete_ReplacingCustomWithSynthesized(
                 SemanticEdit(SemanticEditKind.Update, c => c.GetMember<INamedTypeSymbol>("C").InstanceConstructors.Single(c => c.Parameters is []), preserveLocalVariables: true));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Delete_ReplacingCustomWithSynthesized_ChangingAccessibility(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("", "private", "protected", "internal", "private protected", "internal protected")] string accessibility)
@@ -13419,8 +13405,7 @@ public void Constructor_Instance_Delete_ReplacingCustomWithSynthesized_ChangingA
                 capabilities: EditAndContinueCapabilities.Baseline);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Delete_ReplacingCustomWithSynthesized_AbstractType(
             [CombinatorialValues("record", "class")] string keyword)
         {
@@ -13433,8 +13418,7 @@ public void Constructor_Instance_Delete_ReplacingCustomWithSynthesized_AbstractT
                 SemanticEdit(SemanticEditKind.Update, c => c.GetParameterlessConstructor("C"), preserveLocalVariables: true));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Delete_ReplacingCustomWithSynthesized_AbstractType_ChangingAccessibility(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("", "private", "public", "internal", "private protected", "internal protected")] string accessibility)
@@ -13499,8 +13483,7 @@ public void Constructor_Instance_Delete_Primary_ReplacingWithSynthesized_Record(
                 SemanticEdit(SemanticEditKind.Update, c => c.GetCopyConstructor("C")));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Delete_Primary_ReplacingWithRegular(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("", "private", "protected", "internal", "private protected", "internal protected")] string accessibility)
@@ -13517,8 +13500,7 @@ public void Constructor_Instance_Delete_Primary_ReplacingWithRegular(
                 capabilities: EditAndContinueCapabilities.Baseline);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void Constructor_Instance_Delete_Primary_ReplacingWithRegular_AbstractType(
             [CombinatorialValues("record", "class")] string keyword,
             [CombinatorialValues("", "private", "public", "internal", "private protected", "internal protected")] string accessibility)
@@ -16134,8 +16116,7 @@ class C : B
                 ]);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void MemberInitializer_Update_Lambda_ConstructorWithMemberInitializers_ReplacingCustomWithSynthesized_Primary(
             [CombinatorialValues("", "()")] string initializer, bool isInsert)
         {
diff --git a/src/Features/CSharpTest/UseExpressionBody/Refactoring/UseExpressionBodyFixAllTests.cs b/src/Features/CSharpTest/UseExpressionBody/Refactoring/UseExpressionBodyFixAllTests.cs
index a7b52d7e9a043..abfadc014a842 100644
--- a/src/Features/CSharpTest/UseExpressionBody/Refactoring/UseExpressionBodyFixAllTests.cs
+++ b/src/Features/CSharpTest/UseExpressionBody/Refactoring/UseExpressionBodyFixAllTests.cs
@@ -284,8 +284,7 @@ void M3()
 }", parameters: new TestParameters(options: UseBlockBody));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FixAllDoesNotFixDifferentSymbolKinds(bool forMethods)
         {
             var fixAllAnnotationForMethods = forMethods ? "{|FixAllInDocument:|}" : string.Empty;
diff --git a/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework.UnitTests/HandlerProviderTests.cs b/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework.UnitTests/HandlerProviderTests.cs
index 18c12b0d365be..9bc86ff2fcfa9 100644
--- a/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework.UnitTests/HandlerProviderTests.cs
+++ b/src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework.UnitTests/HandlerProviderTests.cs
@@ -11,8 +11,7 @@ namespace Microsoft.CommonLanguageServerProtocol.Framework.UnitTests;
 
 public class HandlerProviderTests
 {
-    [Theory]
-    [CombinatorialData]
+    [Theory, CombinatorialData]
     public void GetMethodHandler(bool supportsGetRegisteredServices)
     {
         var handlerProvider = GetHandlerProvider(supportsGetRegisteredServices);
@@ -21,8 +20,7 @@ public void GetMethodHandler(bool supportsGetRegisteredServices)
         Assert.Same(TestMethodHandler.Instance, methodHandler);
     }
 
-    [Theory]
-    [CombinatorialData]
+    [Theory, CombinatorialData]
     public void GetMethodHandler_Parameterless(bool supportsGetRegisteredServices)
     {
         var handlerProvider = GetHandlerProvider(supportsGetRegisteredServices);
@@ -31,8 +29,7 @@ public void GetMethodHandler_Parameterless(bool supportsGetRegisteredServices)
         Assert.Same(TestParameterlessMethodHandler.Instance, methodHandler);
     }
 
-    [Theory]
-    [CombinatorialData]
+    [Theory, CombinatorialData]
     public void GetMethodHandler_Notification(bool supportsGetRegisteredServices)
     {
         var handlerProvider = GetHandlerProvider(supportsGetRegisteredServices);
@@ -41,8 +38,7 @@ public void GetMethodHandler_Notification(bool supportsGetRegisteredServices)
         Assert.Same(TestNotificationHandler.Instance, methodHandler);
     }
 
-    [Theory]
-    [CombinatorialData]
+    [Theory, CombinatorialData]
     public void GetMethodHandler_ParameterlessNotification(bool supportsGetRegisteredServices)
     {
         var handlerProvider = GetHandlerProvider(supportsGetRegisteredServices);
@@ -67,8 +63,7 @@ public void GetMethodHandler_WrongResponseType_Throws()
         Assert.Throws<InvalidOperationException>(() => handlerProvider.GetMethodHandler(TestMethodHandler.Name, TestMethodHandler.RequestType, responseType: typeof(long), LanguageServerConstants.DefaultLanguageName));
     }
 
-    [Theory]
-    [CombinatorialData]
+    [Theory, CombinatorialData]
     public void GetRegisteredMethods(bool supportsGetRegisteredServices)
     {
         var handlerProvider = GetHandlerProvider(supportsGetRegisteredServices);
diff --git a/src/Features/LanguageServer/ProtocolUnitTests/Completion/CompletionFeaturesTests.cs b/src/Features/LanguageServer/ProtocolUnitTests/Completion/CompletionFeaturesTests.cs
index b2b813d4c07ed..cfa16156b82ce 100644
--- a/src/Features/LanguageServer/ProtocolUnitTests/Completion/CompletionFeaturesTests.cs
+++ b/src/Features/LanguageServer/ProtocolUnitTests/Completion/CompletionFeaturesTests.cs
@@ -496,8 +496,7 @@ public async Task TestUsingServerDefaultCommitCharacters(bool mutatingLspWorkspa
         }
     }
 
-    [Theory]
-    [CombinatorialData]
+    [Theory, CombinatorialData]
     [WorkItem("https://github.com/dotnet/roslyn/issues/26488")]
     public async Task TestCompletionForObsoleteSymbol(bool mutatingLspWorkspace)
     {
diff --git a/src/Features/Test/EditAndContinue/ActiveStatementsMapTests.cs b/src/Features/Test/EditAndContinue/ActiveStatementsMapTests.cs
index d3bea48ce86cc..8f2b12dc7db8c 100644
--- a/src/Features/Test/EditAndContinue/ActiveStatementsMapTests.cs
+++ b/src/Features/Test/EditAndContinue/ActiveStatementsMapTests.cs
@@ -262,8 +262,7 @@ SourceFileSpan Span(int startLine, int startColumn, int endLine, int endColumn)
                 => new("a.cs", new(new(startLine, startColumn), new(endLine, endColumn)));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void NonRemappableRegionOrdering(bool reverse)
         {
             var source1 =
@@ -312,8 +311,7 @@ static void M()
             Assert.Equal(unmappedActiveStatements[0].Statement.Span, activeStatement.FileSpan.Span);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void SubSpan(bool reverse)
         {
             var source1 =
diff --git a/src/VisualStudio/Core/Test.Next/Options/VisualStudioSettingsOptionPersisterTests.cs b/src/VisualStudio/Core/Test.Next/Options/VisualStudioSettingsOptionPersisterTests.cs
index 7381a03351a4f..be85443f41957 100644
--- a/src/VisualStudio/Core/Test.Next/Options/VisualStudioSettingsOptionPersisterTests.cs
+++ b/src/VisualStudio/Core/Test.Next/Options/VisualStudioSettingsOptionPersisterTests.cs
@@ -155,8 +155,7 @@ public void SettingsChangeEvent()
         refreshedOptions.Clear();
     }
 
-    [Theory]
-    [CombinatorialData]
+    [Theory, CombinatorialData]
     public void SettingsManagerReadOptionValue_Success(
         [CombinatorialValues(
             typeof(bool),
@@ -189,8 +188,7 @@ public void SettingsManagerReadOptionValue_Success(
         Assert.Equal(optionValue, result.Value);
     }
 
-    [Theory]
-    [CombinatorialData]
+    [Theory, CombinatorialData]
     public void SettingsManagerReadOptionValue_Error(
         [CombinatorialValues(
             GetValueResult.Missing,
diff --git a/src/VisualStudio/Core/Test.Next/Services/ServiceHubServicesTests.cs b/src/VisualStudio/Core/Test.Next/Services/ServiceHubServicesTests.cs
index d73b4bb4f6ee9..9ea28f64a6d06 100644
--- a/src/VisualStudio/Core/Test.Next/Services/ServiceHubServicesTests.cs
+++ b/src/VisualStudio/Core/Test.Next/Services/ServiceHubServicesTests.cs
@@ -241,8 +241,7 @@ await solution.CompilationState.GetChecksumAsync(CancellationToken.None),
                 await remoteWorkspace.CurrentSolution.CompilationState.GetChecksumAsync(CancellationToken.None));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1365014")]
         public async Task TestRemoteHostSynchronizeIncrementalUpdate(bool applyInBatch)
         {
diff --git a/src/VisualStudio/Core/Test.Next/Services/SolutionServiceTests.cs b/src/VisualStudio/Core/Test.Next/Services/SolutionServiceTests.cs
index 93583058aead3..7d162f9bed1a9 100644
--- a/src/VisualStudio/Core/Test.Next/Services/SolutionServiceTests.cs
+++ b/src/VisualStudio/Core/Test.Next/Services/SolutionServiceTests.cs
@@ -56,8 +56,7 @@ public async Task TestCreation()
         Assert.Equal(solutionChecksum, await synched.CompilationState.GetChecksumAsync(CancellationToken.None));
     }
 
-    [Theory]
-    [CombinatorialData]
+    [Theory, CombinatorialData]
     public async Task TestGetSolutionWithPrimaryFlag(bool updatePrimaryBranch)
     {
         var code1 = @"class Test1 { void Method() { } }";
diff --git a/src/VisualStudio/Core/Test/CallHierarchy/CallHierarchyTests.vb b/src/VisualStudio/Core/Test/CallHierarchy/CallHierarchyTests.vb
index 024656e352818..e7f6cfe009ee8 100644
--- a/src/VisualStudio/Core/Test/CallHierarchy/CallHierarchyTests.vb
+++ b/src/VisualStudio/Core/Test/CallHierarchy/CallHierarchyTests.vb
@@ -185,8 +185,7 @@ public class D : I
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/981869")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/981869")>
         Public Async Function TestCallHierarchyCrossProjectForImplements() As Task
             Dim input =
 <Workspace>
@@ -225,8 +224,7 @@ class CSharpIt : IChangeSignatureOptionsService
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/981869")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/981869")>
         Public Async Function TestCallHierarchyCrossProjectForCallsTo() As Task
             Dim input =
 <Workspace>
@@ -264,8 +262,7 @@ class D
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/844613")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/844613")>
         Public Async Function TestMustInheritMethodInclusionToOverrides() As Task
             Dim input =
 <Workspace>
@@ -292,8 +289,7 @@ End Class
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1022864")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1022864")>
         Public Async Function TestNavigateCrossProject() As Task
             Dim input =
     <Workspace>
@@ -327,8 +323,7 @@ class D : C
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1022864")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1022864")>
         Public Async Function TestUseDocumentIdWhenNavigating() As Task
             Dim input =
     <Workspace>
@@ -367,8 +362,7 @@ namespace N
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1098507")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1098507")>
         Public Async Function TestDisplayErrorWhenNotOnMemberCS() As Task
             Dim input =
     <Workspace>
@@ -390,8 +384,7 @@ cla$$ss C
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38303")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38303")>
         Public Async Function TestDisplayErrorWhenNotOnMemberCS2() As Task
             Dim input =
     <Workspace>
@@ -414,8 +407,7 @@ class CC
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/38303")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/38303")>
         Public Async Function TestDisplayErrorWhenNotOnMemberCS3() As Task
             Dim input =
     <Workspace>
@@ -438,8 +430,7 @@ class CC
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1098507")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1098507")>
         Public Async Function TestDisplayErrorWhenNotOnMemberVB() As Task
             Dim input =
     <Workspace>
diff --git a/src/VisualStudio/Core/Test/ChangeSignature/AddParameterViewModelTests.vb b/src/VisualStudio/Core/Test/ChangeSignature/AddParameterViewModelTests.vb
index 6910f9af386e0..b167207e190d1 100644
--- a/src/VisualStudio/Core/Test/ChangeSignature/AddParameterViewModelTests.vb
+++ b/src/VisualStudio/Core/Test/ChangeSignature/AddParameterViewModelTests.vb
@@ -308,8 +308,7 @@ class MyClass
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/44958")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/44958")>
         Public Sub AddParameter_SubmittingTypeWithModifiersIsInvalid()
             Dim markup = <Text><![CDATA[
 class MyClass
diff --git a/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb b/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb
index 5f88fb474c41a..ad273f10ae86a 100644
--- a/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb
+++ b/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb
@@ -417,8 +417,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.DebuggerIntelliSense
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/531165")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/531165")>
         Public Async Function ClassDesigner1() As Task
             Dim text = <Workspace>
                            <Project Language="C#" CommonReferences="true">
@@ -445,8 +444,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.DebuggerIntelliSense
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/531167")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/531167")>
         Public Async Function ClassDesigner2() As Task
             Dim text = <Workspace>
                            <Project Language="C#" CommonReferences="true">
@@ -470,8 +468,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.DebuggerIntelliSense
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1124544")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1124544")>
         Public Async Function CompletionUsesContextBufferPositions() As Task
             Dim text = <Workspace>
                            <Project Language="C#" CommonReferences="true">
@@ -735,8 +732,7 @@ $$</Document>
             End Using
         End Function
 
-        <WorkItem("https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1163608")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1163608")>
         Public Async Function TestItemDescription() As Task
             Dim text = <Workspace>
                            <Project Language="C#" CommonReferences="true">
diff --git a/src/VisualStudio/Core/Test/DebuggerIntelliSense/VisualBasicDebuggerIntellisenseTests.vb b/src/VisualStudio/Core/Test/DebuggerIntelliSense/VisualBasicDebuggerIntellisenseTests.vb
index 9aa0ce192fccf..8adb3a0b82751 100644
--- a/src/VisualStudio/Core/Test/DebuggerIntelliSense/VisualBasicDebuggerIntellisenseTests.vb
+++ b/src/VisualStudio/Core/Test/DebuggerIntelliSense/VisualBasicDebuggerIntellisenseTests.vb
@@ -336,8 +336,7 @@ End Module</Document>
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1044441")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1044441")>
         Public Async Function StoppedOnEndSub() As Task
             Dim text = <Workspace>
                            <Project Language="Visual Basic" CommonReferences="true">
@@ -352,8 +351,7 @@ End Module</Document>
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1044441")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1044441")>
         Public Async Function StoppedOnEndProperty() As Task
             Dim text = <Workspace>
                            <Project Language="Visual Basic" CommonReferences="true">
diff --git a/src/VisualStudio/Core/Test/ObjectBrowser/CSharp/ObjectBrowerTests.vb b/src/VisualStudio/Core/Test/ObjectBrowser/CSharp/ObjectBrowerTests.vb
index 3e1e88ab21818..3decfbbb50f12 100644
--- a/src/VisualStudio/Core/Test/ObjectBrowser/CSharp/ObjectBrowerTests.vb
+++ b/src/VisualStudio/Core/Test/ObjectBrowser/CSharp/ObjectBrowerTests.vb
@@ -149,8 +149,7 @@ namespace N
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
         Public Sub TestContent_InheritedMembers1()
             Dim code =
 <Code>
@@ -202,8 +201,7 @@ class C : B
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
         Public Sub TestContent_InheritedMembers2()
             Dim code =
 <Code>
@@ -256,8 +254,7 @@ class C : B
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
         Public Sub TestContent_InheritedMembers3()
             Dim code =
 <Code>
@@ -310,8 +307,7 @@ class C : B
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
         Public Sub TestContent_HelpKeyword_Ctor()
             Dim code =
 <Code>
@@ -503,8 +499,7 @@ $"    {String.Format(ServicesVSResources.Member_of_0, "C")}")
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/939739")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/939739")>
         Public Sub TestDescription_MethodInInterface()
             Dim code =
 <Code>
@@ -1472,8 +1467,7 @@ $"    {String.Format(ServicesVSResources.Member_of_0, "C")}")
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/942021")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/942021")>
         Public Sub TestNavInfo_Class()
             Dim code =
 <Code>
@@ -1498,8 +1492,7 @@ namespace EditorFunctionalityHelper
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/942021")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/942021")>
         Public Sub TestNavInfo_NestedEnum()
             Dim code =
 <Code>
@@ -1531,8 +1524,7 @@ namespace EditorFunctionalityHelper
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/59458")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/59458")>
         Public Sub TestCheckedBinaryOperator()
             Dim code =
 <Code>
@@ -1558,8 +1550,7 @@ class C
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/59458")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/59458")>
         Public Sub TestCheckedUnaryOperator()
             Dim code =
 <Code>
@@ -1585,8 +1576,7 @@ class C
             End Using
         End Sub
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/59458")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/59458")>
         Public Sub TestCheckedCastOperator()
             Dim code =
 <Code>
diff --git a/src/VisualStudio/Core/Test/ObjectBrowser/VisualBasic/ObjectBrowerTests.vb b/src/VisualStudio/Core/Test/ObjectBrowser/VisualBasic/ObjectBrowerTests.vb
index c32984afce2c0..033fe1aec30a8 100644
--- a/src/VisualStudio/Core/Test/ObjectBrowser/VisualBasic/ObjectBrowerTests.vb
+++ b/src/VisualStudio/Core/Test/ObjectBrowser/VisualBasic/ObjectBrowerTests.vb
@@ -142,8 +142,7 @@ End Namespace
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
         Public Sub TestContent_InheritedMembers1()
             Dim code =
 <Code>
@@ -197,8 +196,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
         Public Sub TestContent_InheritedMembers2()
             Dim code =
 <Code>
@@ -253,8 +251,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
         Public Sub TestContent_InheritedMembers3()
             Dim code =
 <Code>
@@ -309,8 +306,7 @@ End Class
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/932387")>
         Public Sub TestContent_HelpKeyword_Ctor()
             Dim code =
 <Code>
@@ -887,8 +883,7 @@ $"    {String.Format(ServicesVSResources.Member_of_0, "N.C")}")
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/939739")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/939739")>
         Public Sub TestDescription_SubInInterface()
             Dim code =
 <Code>
@@ -2286,8 +2281,7 @@ ServicesVSResources.Value_colon & vbCrLf &
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/942021")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/942021")>
         Public Sub TestNavInfo_Class()
             Dim code =
 <Code>
@@ -2310,8 +2304,7 @@ End Namespace
             End Using
         End Sub
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/942021")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/942021")>
         Public Sub TestNavInfo_NestedEnum()
             Dim code =
 <Code>
diff --git a/src/VisualStudio/Core/Test/Progression/ContainsChildrenGraphQueryTests.vb b/src/VisualStudio/Core/Test/Progression/ContainsChildrenGraphQueryTests.vb
index 6a0b1c7681dd2..bc9061ce5293d 100644
--- a/src/VisualStudio/Core/Test/Progression/ContainsChildrenGraphQueryTests.vb
+++ b/src/VisualStudio/Core/Test/Progression/ContainsChildrenGraphQueryTests.vb
@@ -72,8 +72,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Progression
         End Function
 
         <WorkItem("https://github.com/dotnet/roslyn/issues/27805")>
-        <WorkItem("https://devdiv.visualstudio.com/DevDiv/_workitems/edit/233666")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://devdiv.visualstudio.com/DevDiv/_workitems/edit/233666")>
         Public Async Function ContainsChildrenForFileWithIllegalPath() As Task
             Using testState = ProgressionTestState.Create(<Workspace/>)
                 Dim graph = New Graph
@@ -88,8 +87,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Progression
         End Function
 
         <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/789685")>
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/794846")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/794846")>
         Public Async Function ContainsChildrenForNotYetLoadedSolution() As Task
             Using testState = ProgressionTestState.Create(
                     <Workspace>
@@ -127,8 +125,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Progression
             End Using
         End Function
 
-        <WorkItem("https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/165369")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/165369")>
         Public Async Function ContainsChildrenForNodeWithRelativeUriPath() As Task
             Using testState = ProgressionTestState.Create(
                     <Workspace>
diff --git a/src/VisualStudio/Core/Test/Progression/InheritsFromGraphQueryTests.vb b/src/VisualStudio/Core/Test/Progression/InheritsFromGraphQueryTests.vb
index 33b1f45e68347..37c17c1fecc2d 100644
--- a/src/VisualStudio/Core/Test/Progression/InheritsFromGraphQueryTests.vb
+++ b/src/VisualStudio/Core/Test/Progression/InheritsFromGraphQueryTests.vb
@@ -43,8 +43,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Progression
             End Using
         End Function
 
-        <WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546199")>
-        <WpfFact>
+        <WpfFact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/546199")>
         Public Async Function TestErrorBaseType() As Task
             Using testState = ProgressionTestState.Create(
                     <Workspace>
diff --git a/src/VisualStudio/Core/Test/Snippets/CSharpSnippetExpansionClientTests.vb b/src/VisualStudio/Core/Test/Snippets/CSharpSnippetExpansionClientTests.vb
index 17ff5c571085e..40116e888fd13 100644
--- a/src/VisualStudio/Core/Test/Snippets/CSharpSnippetExpansionClientTests.vb
+++ b/src/VisualStudio/Core/Test/Snippets/CSharpSnippetExpansionClientTests.vb
@@ -67,8 +67,7 @@ using G.H.I;
             Await TestSnippetAddImportsAsync(originalCode, namespacesToAdd, placeSystemNamespaceFirst:=True, expectedUpdatedCode:=expectedUpdatedCode)
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/4457")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/4457")>
         Public Async Function TestAddImport_InsideNamespace() As Task
             Dim originalCode = "
 using A;
diff --git a/src/VisualStudio/Core/Test/Snippets/SnippetCompletionProviderTests.vb b/src/VisualStudio/Core/Test/Snippets/SnippetCompletionProviderTests.vb
index 9f54e4b6ded16..403f1480ad5a8 100644
--- a/src/VisualStudio/Core/Test/Snippets/SnippetCompletionProviderTests.vb
+++ b/src/VisualStudio/Core/Test/Snippets/SnippetCompletionProviderTests.vb
@@ -72,8 +72,7 @@ End Class</File>.Value
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/21801")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/21801")>
         Public Async Function SnippetNotOfferedInComments() As Task
             Dim markup = <File>
 Class C
@@ -89,8 +88,7 @@ End Class</File>.Value
             End Using
         End Function
 
-        <WorkItem("https://github.com/dotnet/roslyn/issues/21801")>
-        <WpfFact>
+        <WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/21801")>
         Public Async Function SnippetsNotOfferedInDocComments() As Task
             Dim markup = <File>
 Class C
diff --git a/src/Workspaces/CSharpTest/Formatting/FormattingTests_Patterns.cs b/src/Workspaces/CSharpTest/Formatting/FormattingTests_Patterns.cs
index b1159ead211fd..4caeafdd8856c 100644
--- a/src/Workspaces/CSharpTest/Formatting/FormattingTests_Patterns.cs
+++ b/src/Workspaces/CSharpTest/Formatting/FormattingTests_Patterns.cs
@@ -17,8 +17,7 @@ namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Formatting
     [Trait(Traits.Feature, Traits.Features.Formatting)]
     public class FormattingTests_Patterns : CSharpFormattingTestBase
     {
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FormatRelationalPatterns1(
             [CombinatorialValues("<", "<=", ">", ">=")] string operatorText,
             BinaryOperatorSpacingOptions spacing)
@@ -76,8 +75,7 @@ bool Method(int value)
             await AssertFormatAsync(expected, content, changedOptionSet: changingOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FormatRelationalPatterns2(
             [CombinatorialValues("<", "<=", ">", ">=")] string operatorText,
             BinaryOperatorSpacingOptions spacing,
@@ -167,8 +165,7 @@ bool Method(int value)
             await AssertFormatAsync(expected, content, changedOptionSet: changingOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FormatNotPatterns1(BinaryOperatorSpacingOptions spacing)
         {
             var content = $@"
@@ -224,8 +221,7 @@ bool Method(int value)
             await AssertFormatAsync(expected, content, changedOptionSet: changingOptions);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task FormatNotPatterns2(
             BinaryOperatorSpacingOptions spacing,
             bool spaceWithinExpressionParentheses)
diff --git a/src/Workspaces/CoreTest/Formatter/FormatterTests.cs b/src/Workspaces/CoreTest/Formatter/FormatterTests.cs
index abf74a8dd1a2b..f5f087ef9efda 100644
--- a/src/Workspaces/CoreTest/Formatter/FormatterTests.cs
+++ b/src/Workspaces/CoreTest/Formatter/FormatterTests.cs
@@ -59,8 +59,7 @@ public async Task FormatAsync_ForeignLanguageWithFormattingSupport()
         AssertEx.Equal(@"Formatted with options: LineFormattingOptions { UseTabs = False, TabSize = 4, IndentationSize = 4, NewLine = \r\n }", formattedText.ToString());
     }
 
-    [Theory]
-    [CombinatorialData]
+    [Theory, CombinatorialData]
     public async Task FormatAsync_ForeignLanguageWithFormattingSupport_Options(bool passExplicitOptions)
     {
         var hostServices = s_composition.AddParts([typeof(NoCompilationLanguageService), typeof(TestFormattingService)]).GetHostServices();
diff --git a/src/Workspaces/CoreTest/ObjectSerializationTests.cs b/src/Workspaces/CoreTest/ObjectSerializationTests.cs
index 1afaa16289fda..5bbd3ec074128 100644
--- a/src/Workspaces/CoreTest/ObjectSerializationTests.cs
+++ b/src/Workspaces/CoreTest/ObjectSerializationTests.cs
@@ -246,8 +246,7 @@ public void TestCompressedUInt()
             Assert.Throws<ArgumentException>(() => TestRoundTripCompressedUint(0xC0000000u)); // both high bits set not allowed
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void TestByteSpan([CombinatorialValues(0, 1, 2, 3, 1000, 1000000)] int size)
         {
             var data = new byte[size];
diff --git a/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs b/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs
index ac504d8783806..a98d7291ae18e 100644
--- a/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs
+++ b/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs
@@ -1227,8 +1227,7 @@ public void WithProjectCompilationOptionsExceptionHandling()
             Assert.Throws<InvalidOperationException>(() => solution.WithProjectCompilationOptions(ProjectId.CreateNewId(), options));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void WithProjectCompilationOptionsReplacesSyntaxTreeOptionProvider([CombinatorialValues(LanguageNames.CSharp, LanguageNames.VisualBasic)] string languageName)
         {
             var projectId = ProjectId.CreateNewId();
@@ -3702,8 +3701,7 @@ public async Task TestFrozenPartialSemanticsAfterSingleTextEdit()
             Assert.Contains(await frozenDocument.GetSyntaxTreeAsync(), (await frozenDocument.Project.GetCompilationAsync()).SyntaxTrees);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestFrozenPartialSemanticsWithMulitipleUnrelatedEdits([CombinatorialValues(1, 2, 3)] int documentToFreeze)
         {
             using var workspace = CreateWorkspaceWithPartialSemantics();
@@ -4023,8 +4021,7 @@ public void TestUpdateDocumentsOrderExceptions()
             Assert.Throws<ArgumentException>(() => solution = solution.WithProjectDocumentsOrder(pid, ImmutableList.CreateRange(new[] { did3, did2, did1 })));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAddingEditorConfigFileWithDiagnosticSeverity([CombinatorialValues(LanguageNames.CSharp, LanguageNames.VisualBasic)] string languageName)
         {
             using var workspace = CreateWorkspace();
@@ -4060,8 +4057,7 @@ public async Task TestAddingEditorConfigFileWithDiagnosticSeverity([Combinatoria
             Assert.Equal(ReportDiagnostic.Error, severity);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAddingAndRemovingEditorConfigFileWithDiagnosticSeverity([CombinatorialValues(LanguageNames.CSharp, LanguageNames.VisualBasic)] string languageName)
         {
             using var workspace = CreateWorkspace();
@@ -4102,8 +4098,7 @@ public async Task TestAddingAndRemovingEditorConfigFileWithDiagnosticSeverity([C
             Assert.True(finalCompilation.ContainsSyntaxTree(syntaxTreeAfterRemovingEditorConfig));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestChangingAnEditorConfigFile([CombinatorialValues(LanguageNames.CSharp, LanguageNames.VisualBasic)] string languageName)
         {
             using var workspace = CreateWorkspace();
diff --git a/src/Workspaces/CoreTest/UtilityTest/AsyncLazyTests.cs b/src/Workspaces/CoreTest/UtilityTest/AsyncLazyTests.cs
index c8f23e41194a1..ff97ddfac212b 100644
--- a/src/Workspaces/CoreTest/UtilityTest/AsyncLazyTests.cs
+++ b/src/Workspaces/CoreTest/UtilityTest/AsyncLazyTests.cs
@@ -220,8 +220,7 @@ public void GetValueAsyncThatIsCancelledReturnsTaskCancelledWithCorrectToken()
             }
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         private static void CancellationDuringInlinedComputationFromGetValueOrGetValueAsyncStillCachesResult(bool includeSynchronousComputation)
         {
             var computations = 0;
@@ -272,8 +271,7 @@ public void SynchronousRequestShouldCacheValueWithAsynchronousComputeFunction()
             Assert.Same(secondRequestResult, firstRequestResult);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task AwaitingProducesCorrectException(bool producerAsync, bool consumerAsync)
         {
             var exception = new ArgumentException();
diff --git a/src/Workspaces/CoreTest/WorkspaceServiceTests/GlobalOptionServiceTests.cs b/src/Workspaces/CoreTest/WorkspaceServiceTests/GlobalOptionServiceTests.cs
index cf34c47dcdd13..5a50bd52ddc6a 100644
--- a/src/Workspaces/CoreTest/WorkspaceServiceTests/GlobalOptionServiceTests.cs
+++ b/src/Workspaces/CoreTest/WorkspaceServiceTests/GlobalOptionServiceTests.cs
@@ -50,8 +50,7 @@ public void LegacyGlobalOptions_SetGet()
             Assert.Equal(3, optionService.GetExternallyDefinedOption(optionKey));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public void ExternallyDefinedOption(bool subclass)
         {
             using var workspace1 = new AdhocWorkspace();
diff --git a/src/Workspaces/Remote/ServiceHubTest/TelemetryLoggerTests.cs b/src/Workspaces/Remote/ServiceHubTest/TelemetryLoggerTests.cs
index 8f4b733cd8b9d..c44212acc8ada 100644
--- a/src/Workspaces/Remote/ServiceHubTest/TelemetryLoggerTests.cs
+++ b/src/Workspaces/Remote/ServiceHubTest/TelemetryLoggerTests.cs
@@ -74,8 +74,7 @@ private static string InspectPropertyValue(object? value)
                 _ => value.ToString()!
             };
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         internal void IgnoredSeverity(LogLevel level)
         {
             var logger = new TestLogger();