diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 67436e5..c742c03 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,10 +16,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
-          3.1.x
           6.0.x
           7.0.x
           8.0.x
+          9.0.x
         include-prerelease: true
     - name: Nerdbank.GitVersioning
       uses: dotnet/nbgv@v0.4.0
@@ -30,4 +30,4 @@ jobs:
     - name: Build
       run: dotnet build --configuration Release --no-restore
     - name: Test
-      run: dotnet test --no-restore --verbosity normal
+      run: dotnet test --no-build --configuration Release --verbosity normal -- --coverage --report-trx
diff --git a/Directory.Build.props b/Directory.Build.props
index ec48450..f343102 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,8 +2,15 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
-      <Version>3.6.133</Version>
+      <Version>3.8.118</Version>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+
+  <PropertyGroup>
+    <!-- MSTest config -->
+    <EnableMSTestRunner>true</EnableMSTestRunner>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+    <MSTestAnalysisMode>Recommended</MSTestAnalysisMode>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/StreamRegex.Automata/StreamRegex.Automata.csproj b/StreamRegex.Automata/StreamRegex.Automata.csproj
index de32a4a..bf1596a 100644
--- a/StreamRegex.Automata/StreamRegex.Automata.csproj
+++ b/StreamRegex.Automata/StreamRegex.Automata.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
     </ItemGroup>
 
 </Project>
diff --git a/StreamRegex.Benchmarks/StreamRegex.Benchmarks.csproj b/StreamRegex.Benchmarks/StreamRegex.Benchmarks.csproj
index 2272c04..05f3353 100644
--- a/StreamRegex.Benchmarks/StreamRegex.Benchmarks.csproj
+++ b/StreamRegex.Benchmarks/StreamRegex.Benchmarks.csproj
@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
-      <PackageReference Include="BenchmarkDotNet.Annotations" Version="0.13.12" />
+      <PackageReference Include="BenchmarkDotNet" Version="0.15.4" />
+      <PackageReference Include="BenchmarkDotNet.Annotations" Version="0.15.4" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/StreamRegex.Tests/StreamRegex.Tests.csproj b/StreamRegex.Tests/StreamRegex.Tests.csproj
index ae7acd6..de5afce 100644
--- a/StreamRegex.Tests/StreamRegex.Tests.csproj
+++ b/StreamRegex.Tests/StreamRegex.Tests.csproj
@@ -1,16 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
         <Nullable>enable</Nullable>
-		<LangVersion>10</LangVersion>
+        <LangVersion>10</LangVersion>
         <IsPackable>false</IsPackable>
+        <OutputType>Exe</OutputType>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
+        <PackageReference Include="MSTest" Version="3.7.3" />
+        <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.5.3" />
+        <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
     </ItemGroup>
 
     <ItemGroup>