diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 94d6b357..04d50d3c 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -41,10 +41,10 @@ jobs:
       if: ${{ runner.os != 'Windows' }}
 
     - name: Test - Persistence
-      run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll
+      run: dotnet exec bin/Debug/Persistence.Tests/Persistence.Tests.dll
 
     - name: Test - PAModel
-      run: dotnet bin/Debug/PAModelTests/PAModelTests.dll
+      run: dotnet exec bin/Debug/PAModelTests/PAModelTests.dll
 
     - name: Restore workloads for samples
       run: dotnet workload restore samples/MauiMsApp/MauiMsApp.csproj
diff --git a/global.json b/global.json
index 7900c220..99fdbae1 100644
--- a/global.json
+++ b/global.json
@@ -2,5 +2,8 @@
   "sdk": {
     "version": "8.0.0",
     "rollForward": "latestMinor"
+  },
+  "msbuild-sdks": {
+    "MSTest.Sdk": "3.7.3"
   }
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 6090760c..49120afc 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -7,6 +7,14 @@
         <GenerateDocumentationFile>True</GenerateDocumentationFile>
         <NoWarn>1591</NoWarn>
         <ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
+
+        <!-- While these are already the defaults when using MSTest.Sdk, we are explicit about that. -->
+        <!-- It can be helpful if some new project is introduced and is not using MSTest.Sdk -->
+        <EnableMSTestRunner>true</EnableMSTestRunner>
+        <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+
+        <!-- Currently defaults to false -->
+        <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
     </PropertyGroup>
 
     <PropertyGroup Label="Code Analysis config">
diff --git a/src/PAModelTests/AppTestsTest.cs b/src/PAModelTests/AppTestsTest.cs
index 523ca9a8..85201421 100644
--- a/src/PAModelTests/AppTestsTest.cs
+++ b/src/PAModelTests/AppTestsTest.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 
diff --git a/src/PAModelTests/ChecksumTests.cs b/src/PAModelTests/ChecksumTests.cs
index b0ec7e91..c4277872 100644
--- a/src/PAModelTests/ChecksumTests.cs
+++ b/src/PAModelTests/ChecksumTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using System.Reflection;
 using System.Text;
 using Microsoft.PowerPlatform.Formulas.Tools;
diff --git a/src/PAModelTests/DataSourceTests.cs b/src/PAModelTests/DataSourceTests.cs
index e22f8783..7a5f5b16 100644
--- a/src/PAModelTests/DataSourceTests.cs
+++ b/src/PAModelTests/DataSourceTests.cs
@@ -2,9 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Data;
-using System.IO;
 using System.IO.Compression;
-using System.Linq;
 using Microsoft.AppMagic.Authoring.Persistence;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.Extensions;
diff --git a/src/PAModelTests/DefaultValuesTransformTests.cs b/src/PAModelTests/DefaultValuesTransformTests.cs
index 05eb263d..46fb2a81 100644
--- a/src/PAModelTests/DefaultValuesTransformTests.cs
+++ b/src/PAModelTests/DefaultValuesTransformTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.AppMagic.Authoring.Persistence;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.ControlTemplates;
diff --git a/src/PAModelTests/EditorStateTests.cs b/src/PAModelTests/EditorStateTests.cs
index 56934f19..8f58b0bb 100644
--- a/src/PAModelTests/EditorStateTests.cs
+++ b/src/PAModelTests/EditorStateTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.EditorState;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
diff --git a/src/PAModelTests/EntropyTests.cs b/src/PAModelTests/EntropyTests.cs
index e9097ef0..f5a35d5c 100644
--- a/src/PAModelTests/EntropyTests.cs
+++ b/src/PAModelTests/EntropyTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
diff --git a/src/PAModelTests/ErrorTests.cs b/src/PAModelTests/ErrorTests.cs
index f37d38e6..1ff564d3 100644
--- a/src/PAModelTests/ErrorTests.cs
+++ b/src/PAModelTests/ErrorTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 
diff --git a/src/PAModelTests/GroupControlRecreationTest.cs b/src/PAModelTests/GroupControlRecreationTest.cs
index e4650873..c430ea82 100644
--- a/src/PAModelTests/GroupControlRecreationTest.cs
+++ b/src/PAModelTests/GroupControlRecreationTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IR;
 
diff --git a/src/PAModelTests/NameCollisionTests.cs b/src/PAModelTests/NameCollisionTests.cs
index e6246eb8..729b95a3 100644
--- a/src/PAModelTests/NameCollisionTests.cs
+++ b/src/PAModelTests/NameCollisionTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
diff --git a/src/PAModelTests/PAModelTests.csproj b/src/PAModelTests/PAModelTests.csproj
index e060d228..5f6bfc77 100644
--- a/src/PAModelTests/PAModelTests.csproj
+++ b/src/PAModelTests/PAModelTests.csproj
@@ -1,26 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <PublicSign>true</PublicSign>
-    <EnableMSTestRunner>true</EnableMSTestRunner>
     <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
-    <PackageReference Include="MSTest" Version="$(MSTest)" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
     <PackageReference Include="YamlDotNet" Version="$(YamlDotNetVersion)" />
   </ItemGroup>
 
   <ItemGroup Label="Global usings">
     <Using Include="FluentAssertions" />
-    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/PAModelTests/PublicSurfaceTests.cs b/src/PAModelTests/PublicSurfaceTests.cs
index 3abf4851..ad368b16 100644
--- a/src/PAModelTests/PublicSurfaceTests.cs
+++ b/src/PAModelTests/PublicSurfaceTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.Linq;
 using System.Text;
 using Microsoft.PowerPlatform.Formulas.Tools;
 
diff --git a/src/PAModelTests/ReadTransformTests.cs b/src/PAModelTests/ReadTransformTests.cs
index ceff8c14..126ae083 100644
--- a/src/PAModelTests/ReadTransformTests.cs
+++ b/src/PAModelTests/ReadTransformTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
diff --git a/src/PAModelTests/RoundtripTests.cs b/src/PAModelTests/RoundtripTests.cs
index 297f0df7..0ef963d8 100644
--- a/src/PAModelTests/RoundtripTests.cs
+++ b/src/PAModelTests/RoundtripTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using Microsoft.PowerPlatform.Formulas.Tools;
 
 namespace PAModelTests;
diff --git a/src/PAModelTests/SmartMergeTests.cs b/src/PAModelTests/SmartMergeTests.cs
index 019e315e..1dd9aa80 100644
--- a/src/PAModelTests/SmartMergeTests.cs
+++ b/src/PAModelTests/SmartMergeTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.EditorState;
 using Microsoft.PowerPlatform.Formulas.Tools.IR;
diff --git a/src/PAModelTests/SourceDecoderTests.cs b/src/PAModelTests/SourceDecoderTests.cs
index 4ac35f28..63b5ca55 100644
--- a/src/PAModelTests/SourceDecoderTests.cs
+++ b/src/PAModelTests/SourceDecoderTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 
diff --git a/src/PAModelTests/TemplateParserTests.cs b/src/PAModelTests/TemplateParserTests.cs
index 6471ec3d..789cc2db 100644
--- a/src/PAModelTests/TemplateParserTests.cs
+++ b/src/PAModelTests/TemplateParserTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.AppMagic.Authoring.Persistence;
 using Microsoft.PowerPlatform.Formulas.Tools.ControlTemplates;
 using Microsoft.PowerPlatform.Formulas.Tools.EditorState;
diff --git a/src/PAModelTests/TemplateStoreTests.cs b/src/PAModelTests/TemplateStoreTests.cs
index b7be16db..138a7d1f 100644
--- a/src/PAModelTests/TemplateStoreTests.cs
+++ b/src/PAModelTests/TemplateStoreTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.IR;
diff --git a/src/PAModelTests/UtilityTests.cs b/src/PAModelTests/UtilityTests.cs
index 77bd6d31..0c3ddcf9 100644
--- a/src/PAModelTests/UtilityTests.cs
+++ b/src/PAModelTests/UtilityTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 
 namespace PAModelTests;
diff --git a/src/PAModelTests/WriteTransformTests.cs b/src/PAModelTests/WriteTransformTests.cs
index 88c62b8c..319238e2 100644
--- a/src/PAModelTests/WriteTransformTests.cs
+++ b/src/PAModelTests/WriteTransformTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
diff --git a/src/PAModelTests/YamlSerializerTests/YamlSerializerTests.cs b/src/PAModelTests/YamlSerializerTests/YamlSerializerTests.cs
index 1debc79a..6996028c 100644
--- a/src/PAModelTests/YamlSerializerTests/YamlSerializerTests.cs
+++ b/src/PAModelTests/YamlSerializerTests/YamlSerializerTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.Yaml;
 
 namespace PAModelTests.YamlSerializerTests;
diff --git a/src/PAModelTests/YamlTest.cs b/src/PAModelTests/YamlTest.cs
index eaf9b290..f5ac542f 100644
--- a/src/PAModelTests/YamlTest.cs
+++ b/src/PAModelTests/YamlTest.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.Yaml;
 using YamlDotNet.Serialization;
 
diff --git a/src/Persistence.Tests/Persistence.Tests.csproj b/src/Persistence.Tests/Persistence.Tests.csproj
index 215bc194..26835137 100644
--- a/src/Persistence.Tests/Persistence.Tests.csproj
+++ b/src/Persistence.Tests/Persistence.Tests.csproj
@@ -1,12 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
     <PropertyGroup>
         <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <EnableMSTestRunner>true</EnableMSTestRunner>
         <OutputType>Exe</OutputType>
-        <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
 
         <SignAssembly>true</SignAssembly>
@@ -28,16 +26,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
-        <PackageReference Include="MSTest" Version="$(MSTest)" />
-        <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
         <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
         <PackageReference Include="Moq" Version="$(MoqVersion)" />
     </ItemGroup>
 
     <ItemGroup Label="Global usings">
         <Using Include="FluentAssertions" />
-        <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
         <Using Include="Persistence.Tests.Extensions" />
         <Using Include="Microsoft.Extensions.DependencyInjection" />
     </ItemGroup>
diff --git a/src/Versions.props b/src/Versions.props
index 1b4a289b..69420ce1 100644
--- a/src/Versions.props
+++ b/src/Versions.props
@@ -2,11 +2,6 @@
     <PropertyGroup>
         <TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
         <YamlDotNetVersion>15.1.6</YamlDotNetVersion>
-        <MicrosoftNETTestSdkVersion>17.7.1</MicrosoftNETTestSdkVersion>
-        <MSTestTestAdapterVersion>3.2.2</MSTestTestAdapterVersion>
-        <MSTestTestFrameworkVersion>3.2.2</MSTestTestFrameworkVersion>
-        <MSTest>3.2.2</MSTest>
-        <CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
         <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
         <MinVerVersion>4.3.0</MinVerVersion>
         <MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
diff --git a/src/YamlValidator.Tests/YamlValidator.Tests.csproj b/src/YamlValidator.Tests/YamlValidator.Tests.csproj
index 5cab08d7..8a0822ed 100644
--- a/src/YamlValidator.Tests/YamlValidator.Tests.csproj
+++ b/src/YamlValidator.Tests/YamlValidator.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -6,7 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
-    <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
 
     <SignAssembly>true</SignAssembly>
@@ -20,14 +19,7 @@
      </None>
   </ItemGroup>
 
-  <ItemGroup>
-     <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
-     <PackageReference Include="MSTest" Version="$(MSTest)" />
-     <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
-  </ItemGroup>
-
   <ItemGroup Label="Global usings">
-    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
     <Using Include="Microsoft.Extensions.DependencyInjection" />
   </ItemGroup>