diff --git a/UnitTests/Directory.Build.props b/UnitTests/Directory.Build.props
index b598b1d..6f5003e 100644
--- a/UnitTests/Directory.Build.props
+++ b/UnitTests/Directory.Build.props
@@ -17,9 +17,6 @@ SPDX-License-Identifier: MIT
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
     <NoWarn>$(NoWarn),IDE0053,IDE0058,IDE0200</NoWarn>
-
-    <!-- Bump MSTest.Sdk "transitive" dependencies (they are actually direct dependencies) -->
-    <MicrosoftNETTestSdkVersion>18.0.0</MicrosoftNETTestSdkVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/UnitTests/UnitTests/MSTestSettings.cs b/UnitTests/UnitTests/MSTestSettings.cs
index 85c6483..b18294c 100644
--- a/UnitTests/UnitTests/MSTestSettings.cs
+++ b/UnitTests/UnitTests/MSTestSettings.cs
@@ -3,4 +3,3 @@
 // SPDX-License-Identifier: MIT
 
 [assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
-[assembly: ClassCleanupExecution(ClassCleanupBehavior.EndOfClass)]
diff --git a/UnitTests/UnitTests/SignTests.cs b/UnitTests/UnitTests/SignTests.cs
index 1f61cfa..688ded1 100644
--- a/UnitTests/UnitTests/SignTests.cs
+++ b/UnitTests/UnitTests/SignTests.cs
@@ -94,11 +94,16 @@ public unsafe void SignLarge_Destination_TooShort()
         // undersized
         var signature = new byte[1024];
 
-        Assert.ThrowsExactly<ArgumentException>(() =>
+        void test()
         {
+            // setup
             byte message = 42;
+
+            // test
             _ = Xmss.Sign(&message, 1, signature);
-        });
+        }
+
+        Assert.ThrowsExactly<ArgumentException>(test);
     }
 
     [TestMethod]
diff --git a/global.json b/global.json
index a21b578..bf1ce32 100644
--- a/global.json
+++ b/global.json
@@ -6,6 +6,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.134",
-    "MSTest.Sdk": "3.11.0"
+    "MSTest.Sdk": "4.0.0"
   }
 }
\ No newline at end of file