diff --git a/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs b/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs
index a54ccf79..73cdce17 100644
--- a/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs
+++ b/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs
@@ -61,6 +61,23 @@ public GeneratorTests(ITestOutputHelper logger)
             new object[] { "net5.0" },
         };
 
+    public static Platform[] SpecificCpuArchitectures =>
+        new Platform[]
+        {
+            Platform.X86,
+            Platform.X64,
+            Platform.Arm64,
+        };
+
+    public static Platform[] AnyCpuArchitectures =>
+        new Platform[]
+        {
+            Platform.AnyCpu,
+            Platform.X86,
+            Platform.X64,
+            Platform.Arm64,
+        };
+
     public async Task InitializeAsync()
     {
         this.starterCompilations.Add("net35", await this.CreateCompilationAsync(MyReferenceAssemblies.NetFramework.Net35));
@@ -1216,7 +1233,17 @@ public void RenamedMethodsClass()
     }
 
     [Theory, PairwiseData]
-    public void FullGeneration(bool allowMarshaling, [CombinatorialValues(Platform.AnyCpu, Platform.X86, Platform.X64, Platform.Arm64)] Platform platform)
+    public void TBButton([CombinatorialMemberData(nameof(SpecificCpuArchitectures))] Platform platform)
+    {
+        this.compilation = this.compilation.WithOptions(this.compilation.Options.WithPlatform(platform));
+        this.generator = this.CreateGenerator();
+        Assert.True(this.generator.TryGenerate("TBBUTTON", CancellationToken.None));
+        this.CollectGeneratedCode(this.generator);
+        this.AssertNoDiagnostics();
+    }
+
+    [Theory, PairwiseData]
+    public void FullGeneration(bool allowMarshaling, [CombinatorialMemberData(nameof(AnyCpuArchitectures))] Platform platform)
     {
         var generatorOptions = new GeneratorOptions { AllowMarshaling = allowMarshaling };
         this.compilation = this.compilation.WithOptions(this.compilation.Options.WithPlatform(platform));
diff --git a/test/Microsoft.Windows.CsWin32.Tests/Microsoft.Windows.CsWin32.Tests.csproj b/test/Microsoft.Windows.CsWin32.Tests/Microsoft.Windows.CsWin32.Tests.csproj
index f34d7bfc..ed3e5f82 100644
--- a/test/Microsoft.Windows.CsWin32.Tests/Microsoft.Windows.CsWin32.Tests.csproj
+++ b/test/Microsoft.Windows.CsWin32.Tests/Microsoft.Windows.CsWin32.Tests.csproj
@@ -41,7 +41,7 @@
     <PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
     <PackageReference Include="System.Text.Json" Version="5.0.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="Xunit.Combinatorial" Version="1.4.1" />
+    <PackageReference Include="Xunit.Combinatorial" Version="1.5.7-beta" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
   </ItemGroup>