diff --git a/Tests/Reqnroll.PluginTests/RuntimePluginLocatorTests.cs b/Tests/Reqnroll.PluginTests/RuntimePluginLocatorTests.cs
index cfc8c1c72..60f67f0d9 100644
--- a/Tests/Reqnroll.PluginTests/RuntimePluginLocatorTests.cs
+++ b/Tests/Reqnroll.PluginTests/RuntimePluginLocatorTests.cs
@@ -48,15 +48,17 @@ public void LoadPlugins_Find_All_Referenced_Plugins()
             var allProjectReferenceFoundByPluginLocator = projectReferences.All(pr => plugins.Any(plugin => plugin.Contains(pr)));
             allProjectReferenceFoundByPluginLocator.Should().BeTrue();
 
-            var foundPlugins = plugins.Select(Path.GetFileName);
+            var foundPlugins = plugins.Select(Path.GetFileName).OrderBy(p => p);
             foundPlugins.Should().BeEquivalentTo([
-                "Reqnroll.PluginTests.dll", // This test assembly
-                "Reqnroll.Microsoft.Extensions.DependencyInjection.ReqnrollPlugin.dll",
                 "Reqnroll.Autofac.ReqnrollPlugin.dll", 
                 "Reqnroll.ExternalData.ReqnrollPlugin.dll",
+                "Reqnroll.Microsoft.Extensions.DependencyInjection.ReqnrollPlugin.dll",
+                "Reqnroll.MSTest.Generator.ReqnrollPlugin.dll", 
+                "Reqnroll.MSTest.ReqnrollPlugin.dll", 
+                "Reqnroll.NUnit.Generator.ReqnrollPlugin.dll", 
+                "Reqnroll.NUnit.ReqnrollPlugin.dll",                 
+                "Reqnroll.PluginTests.dll", // This test assembly
                 "Reqnroll.Windsor.ReqnrollPlugin.dll",
-                "Reqnroll.MSTest.ReqnrollPlugin.dll",
-                "Reqnroll.NUnit.ReqnrollPlugin.dll",
                 "Reqnroll.xUnit.ReqnrollPlugin.dll",
                 "Reqnroll.xUnit.Generator.ReqnrollPlugin.dll",
             ]);
diff --git a/Tests/Reqnroll.RuntimeTests/Formatters/FormatterBaseTests.cs b/Tests/Reqnroll.RuntimeTests/Formatters/FormatterBaseTests.cs
index 9306179c2..746fe3c70 100644
--- a/Tests/Reqnroll.RuntimeTests/Formatters/FormatterBaseTests.cs
+++ b/Tests/Reqnroll.RuntimeTests/Formatters/FormatterBaseTests.cs
@@ -17,21 +17,18 @@ namespace Reqnroll.RuntimeTests.Formatters;
 
 public class FormatterBaseTests
 {
-    private class TestFormatter : FormatterBase
+    private class TestFormatter(IFormattersConfigurationProvider config, IFormatterLog logger, string name) : FormatterBase(config, logger, name)
     {
         public bool LaunchInnerCalled = false;
         public IDictionary<string, object> LaunchInnerConfig = null!;
         public Action<bool> LaunchInnerCallback = null!;
         public bool ConsumeAndFormatMessagesCalled = false;
         public CancellationToken? ConsumedToken;
-        public List<Envelope> ConsumedMessages = new();
+        public List<Envelope> ConsumedMessages = [];
         public bool ReportInitializedCalled = false;
         public bool CloseAsyncCalled = false;
         public bool CompleteWriterOnLaunchInner = false;
 
-        public TestFormatter(IFormattersConfigurationProvider config, IFormatterLog logger, string name)
-            : base(config, logger, name) { }
-
         public override void LaunchInner(IDictionary<string, object> formatterConfig, Action<bool> onAfterInitialization)
         {
             LaunchInnerCalled = true;