diff --git a/.editorconfig b/.editorconfig
index 383bd380f4..63e7fac17d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -150,6 +150,30 @@ dotnet_style_null_propagation = true
 # IDE0034: Simplify 'default' expression
 dotnet_diagnostic.IDE0034.severity = warning
 
+# IDE0090: Use 'new(...)'
+dotnet_diagnostic.IDE0090.severity = warning
+
+# IDE0150: Prefer 'null' check over type check
+dotnet_diagnostic.IDE0150.severity = warning
+
+# IDE0028: Simplify collection initialization
+dotnet_diagnostic.IDE0028.severity = warning
+
+# IDE0017: Simplify object initialization
+dotnet_diagnostic.IDE0017.severity = warning
+
+# CA1829: Use Length/Count property instead of Count() when available
+dotnet_diagnostic.CA1829.severity = warning
+
+# CA1840: Use 'Environment.CurrentManagedThreadId'
+dotnet_diagnostic.CA1840.severity = warning
+
+# CA1825: Avoid zero-length array allocations
+dotnet_diagnostic.CA1825.severity = warning
+
+# CA1854: Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
+dotnet_diagnostic.CA1854.severity = warning
+
 #### Naming styles ####
 
 # Naming rules (define naming rule using dotnet_naming_rule.<rule_name>.<option>)
@@ -229,15 +253,3 @@ dotnet_naming_style.s_underscore_camel_case.required_prefix = s_
 dotnet_naming_style.s_underscore_camel_case.required_suffix =
 dotnet_naming_style.s_underscore_camel_case.word_separator =
 dotnet_naming_style.s_underscore_camel_case.capitalization = camel_case
-
-# IDE0090: Use 'new(...)'
-dotnet_diagnostic.IDE0090.severity = warning
-
-# IDE0150: Prefer 'null' check over type check
-dotnet_diagnostic.IDE0150.severity = warning
-
-# IDE0028: Simplify collection initialization
-dotnet_diagnostic.IDE0028.severity = warning
-
-# IDE0017: Simplify object initialization
-dotnet_diagnostic.IDE0017.severity = warning
diff --git a/Directory.Build.props b/Directory.Build.props
index 9795bac6ce..f2e391da1f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,8 +3,17 @@
   <Import Project="scripts\build\TestFx.props" />
   <Import Project="eng\TFMConfiguration.props" />
 
+  <!-- Language configuration -->
   <PropertyGroup>
-    <LangVersion>Latest</LangVersion>
+    <!-- default to allowing all language features -->
+    <LangVersion>preview</LangVersion>
+    <!-- enable strict mode for Roslyn compiler -->
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <!-- default to max warnlevel -->
+    <AnalysisLevel>preview</AnalysisLevel>
   </PropertyGroup>
+
 </Project>
diff --git a/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs b/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs
index 905e3f23b3..4c39613f9b 100644
--- a/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs
+++ b/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs
@@ -370,10 +370,9 @@ private bool ProcessTestDataSourceTests(UnitTestElement test, MethodInfo methodI
                 discoveredTest.DisplayName = dataSource.GetDisplayName(methodInfo, d) ?? discoveredTest.DisplayName;
 
                 // if we have a duplicate test name don't expand the test, bail out.
-                if (discoveredTests.ContainsKey(discoveredTest.DisplayName))
+                if (discoveredTests.TryGetValue(discoveredTest.DisplayName, out var firstTestSeen))
                 {
-                    var firstSeen = discoveredIndex[discoveredTest.DisplayName];
-                    var warning = string.Format(CultureInfo.CurrentCulture, Resource.CannotExpandIDataSourceAttribute_DuplicateDisplayName, firstSeen, index, discoveredTest.DisplayName);
+                    var warning = string.Format(CultureInfo.CurrentCulture, Resource.CannotExpandIDataSourceAttribute_DuplicateDisplayName, firstTestSeen, index, discoveredTest.DisplayName);
                     warning = string.Format(CultureInfo.CurrentUICulture, Resource.CannotExpandIDataSourceAttribute, test.TestMethod.ManagedTypeName, test.TestMethod.ManagedMethodName, warning);
                     PlatformServiceProvider.Instance.AdapterTraceLogger.LogWarning($"DynamicDataEnumarator: {warning}");
 
@@ -388,7 +387,7 @@ private bool ProcessTestDataSourceTests(UnitTestElement test, MethodInfo methodI
                 }
                 catch (SerializationException)
                 {
-                    var firstSeen = discoveredIndex[discoveredTest.DisplayName];
+                    var firstIndexSeen = discoveredIndex[discoveredTest.DisplayName];
                     var warning = string.Format(CultureInfo.CurrentCulture, Resource.CannotExpandIDataSourceAttribute_CannotSerialize, index, discoveredTest.DisplayName);
                     warning = string.Format(CultureInfo.CurrentUICulture, Resource.CannotExpandIDataSourceAttribute, test.TestMethod.ManagedTypeName, test.TestMethod.ManagedMethodName, warning);
                     PlatformServiceProvider.Instance.AdapterTraceLogger.LogWarning($"DynamicDataEnumarator: {warning}");
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/TestExecutionManager.cs b/src/Adapter/MSTest.TestAdapter/Execution/TestExecutionManager.cs
index 64d23f44fb..6208dbe175 100644
--- a/src/Adapter/MSTest.TestAdapter/Execution/TestExecutionManager.cs
+++ b/src/Adapter/MSTest.TestAdapter/Execution/TestExecutionManager.cs
@@ -225,7 +225,7 @@ private void ExecuteTestsInSource(IEnumerable<TestCase> tests, IRunContext runCo
         PlatformServiceProvider.Instance.AdapterTraceLogger.LogInfo("Created unit-test runner {0}", source);
 
         // Default test set is filtered tests based on user provided filter criteria
-        ICollection<TestCase> testsToRun = new TestCase[0];
+        ICollection<TestCase> testsToRun = Array.Empty<TestCase>();
         var filterExpression = TestMethodFilter.GetFilterExpression(runContext, frameworkHandle, out var filterHasError);
         if (filterHasError)
         {
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/TestMethodInfo.cs b/src/Adapter/MSTest.TestAdapter/Execution/TestMethodInfo.cs
index 35a1ad2f89..57ebf4257a 100644
--- a/src/Adapter/MSTest.TestAdapter/Execution/TestMethodInfo.cs
+++ b/src/Adapter/MSTest.TestAdapter/Execution/TestMethodInfo.cs
@@ -770,6 +770,6 @@ void executeAsyncAction()
 
     private static class EmptyHolder<T>
     {
-        internal static readonly T[] Array = new T[0];
+        internal static readonly T[] Array = System.Array.Empty<T>();
     }
 }
diff --git a/src/Adapter/MSTest.TestAdapter/Helpers/DictionaryHelper.cs b/src/Adapter/MSTest.TestAdapter/Helpers/DictionaryHelper.cs
index 1b6fdb2f78..3de0c3b363 100644
--- a/src/Adapter/MSTest.TestAdapter/Helpers/DictionaryHelper.cs
+++ b/src/Adapter/MSTest.TestAdapter/Helpers/DictionaryHelper.cs
@@ -40,6 +40,7 @@ public static IDictionary<TKey, TValue> ConcatWithOverwrites<TKey, TValue>(
         var overwrites = new List<TKey>();
         foreach (var k in overwrite.Keys)
         {
+#pragma warning disable CA1854 // Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method | False-positive
             if (destination.ContainsKey(k))
             {
                 PlatformServiceProvider.Instance.AdapterTraceLogger.LogInfo("DictionaryHelper.ConcatWithOverwrites: The {0} already contains key {1}. Overwriting it with value from {2}.", sourceFriendlyName, k, overwriteFriendlyName);
@@ -51,6 +52,7 @@ public static IDictionary<TKey, TValue> ConcatWithOverwrites<TKey, TValue>(
                 PlatformServiceProvider.Instance.AdapterTraceLogger.LogInfo("DictionaryHelper.ConcatWithOverwrites: The {0} does not contain key {1}. Adding it from {2}.", sourceFriendlyName, k, overwriteFriendlyName);
                 destination.Add(k, overwrite[k]);
             }
+#pragma warning restore CA1854 // Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
         }
 
         PlatformServiceProvider.Instance.AdapterTraceLogger.LogInfo("DictionaryHelper.ConcatWithOverwrites: Merging done: Resulting dictionary has keys {0}, overwrites {1}.", string.Join(", ", destination.Keys), string.Join(", ", overwrites));
diff --git a/src/Adapter/PlatformServices/Deployment/AssemblyLoadWorker.cs b/src/Adapter/PlatformServices/Deployment/AssemblyLoadWorker.cs
index b7c5651f35..f3b64860db 100644
--- a/src/Adapter/PlatformServices/Deployment/AssemblyLoadWorker.cs
+++ b/src/Adapter/PlatformServices/Deployment/AssemblyLoadWorker.cs
@@ -59,7 +59,7 @@ public string[] GetFullPathToDependentAssemblies(string assemblyPath, out IList<
             EqtTrace.Error(ex);
 
             warnings.Add(ex.Message);
-            return new string[0]; // Otherwise just return no dependencies.
+            return Array.Empty<string>(); // Otherwise just return no dependencies.
         }
 
         Debug.Assert(assembly != null, "assembly");
@@ -168,7 +168,7 @@ private void ProcessChildren(Assembly assembly, IList<string> result, ISet<strin
         }
 
         // Take care of .netmodule's.
-        var modules = new Module[0];
+        var modules = Array.Empty<Module>();
         try
         {
             EqtTrace.Verbose($"AssemblyLoadWorker.GetFullPathToDependentAssemblies: Getting modules of {assembly.FullName}.");
diff --git a/src/Adapter/PlatformServices/Services/TestDataSource.cs b/src/Adapter/PlatformServices/Services/TestDataSource.cs
index 4d84e5da64..9e7ceeb413 100644
--- a/src/Adapter/PlatformServices/Services/TestDataSource.cs
+++ b/src/Adapter/PlatformServices/Services/TestDataSource.cs
@@ -57,9 +57,10 @@ IEnumerable<object> ITestDataSource.GetData(UTF.ITestMethod testMethodInfo, ITes
         {
             GetConnectionProperties(testMethodInfo.GetAttributes<UTF.DataSourceAttribute>(false)[0], out providerNameInvariant, out connectionString, out tableName, out dataAccessMethod);
         }
-        catch (Exception ex)
+        catch
         {
-            throw ex;
+            // REVIEW ME: @Haplois, was there any good reason to mess up stack trace?
+            throw;
         }
 
         try
diff --git a/src/TestFramework/MSTest.Core/Assertions/StringAssert.cs b/src/TestFramework/MSTest.Core/Assertions/StringAssert.cs
index 4c11e0a9ce..5b77da8613 100644
--- a/src/TestFramework/MSTest.Core/Assertions/StringAssert.cs
+++ b/src/TestFramework/MSTest.Core/Assertions/StringAssert.cs
@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting;
 /// </summary>
 public sealed class StringAssert
 {
-    private static readonly object[] Empty = new object[0];
+    private static readonly object[] Empty = Array.Empty<object>();
 
     private static StringAssert s_that;
 
diff --git a/src/TestFramework/MSTest.Core/Attributes/DataSource/DataRowAttribute.cs b/src/TestFramework/MSTest.Core/Attributes/DataSource/DataRowAttribute.cs
index d30dc7c4e8..0950dbe699 100644
--- a/src/TestFramework/MSTest.Core/Attributes/DataSource/DataRowAttribute.cs
+++ b/src/TestFramework/MSTest.Core/Attributes/DataSource/DataRowAttribute.cs
@@ -20,7 +20,7 @@ public class DataRowAttribute : Attribute, ITestDataSource
     /// </summary>
     public DataRowAttribute()
     {
-        Data = new object[0];
+        Data = Array.Empty<object>();
     }
 
     /// <summary>
diff --git a/test/E2ETests/DiscoveryAndExecutionTests/Extensions/AssertionExtensions.cs b/test/E2ETests/DiscoveryAndExecutionTests/Extensions/AssertionExtensions.cs
index 1dcc937735..195caf349d 100644
--- a/test/E2ETests/DiscoveryAndExecutionTests/Extensions/AssertionExtensions.cs
+++ b/test/E2ETests/DiscoveryAndExecutionTests/Extensions/AssertionExtensions.cs
@@ -100,7 +100,7 @@ private static void ContainsExpectedTestsWithOutcome(IEnumerable<TestResult> out
     {
         if (matchCount)
         {
-            var expectedCount = expectedTests.Count();
+            var expectedCount = expectedTests.Length;
             AssertOutcomeCount(outcomedTests, expectedOutcome, expectedCount);
         }
 
diff --git a/test/UnitTests/MSTest.Core.Unit.Tests/Attributes/DataRowAttributeTests.cs b/test/UnitTests/MSTest.Core.Unit.Tests/Attributes/DataRowAttributeTests.cs
index a7aeeab478..5ab5ebf4bc 100644
--- a/test/UnitTests/MSTest.Core.Unit.Tests/Attributes/DataRowAttributeTests.cs
+++ b/test/UnitTests/MSTest.Core.Unit.Tests/Attributes/DataRowAttributeTests.cs
@@ -25,7 +25,7 @@ public void DefaultConstructorSetsEmptyArrayPassed()
     {
         var dataRow = new DataRowAttribute();
 
-        CollectionAssert.AreEqual(new object[] { }, dataRow.Data);
+        CollectionAssert.AreEqual(System.Array.Empty<object>(), dataRow.Data);
     }
 
     [TestMethod]
diff --git a/test/UnitTests/MSTest.Core.Unit.Tests/Attributes/DynamicDataAttributeTests.cs b/test/UnitTests/MSTest.Core.Unit.Tests/Attributes/DynamicDataAttributeTests.cs
index 20af2b2cb3..9cd750d1b1 100644
--- a/test/UnitTests/MSTest.Core.Unit.Tests/Attributes/DynamicDataAttributeTests.cs
+++ b/test/UnitTests/MSTest.Core.Unit.Tests/Attributes/DynamicDataAttributeTests.cs
@@ -310,7 +310,7 @@ public static IEnumerable<object[]> EmptyProperty
     {
         get
         {
-            return new object[][] { };
+            return Array.Empty<object[]>();
         }
     }
 
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/AssemblyEnumeratorTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/AssemblyEnumeratorTests.cs
index f869cb904f..266d2ec21c 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/AssemblyEnumeratorTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/AssemblyEnumeratorTests.cs
@@ -405,13 +405,13 @@ private static Mock<TestableAssembly> CreateMockTestableAssembly()
             .Setup(a => a.GetCustomAttributes(
                 typeof(FrameworkV2::Microsoft.VisualStudio.TestTools.UnitTesting.DiscoverInternalsAttribute),
                 true))
-            .Returns(new Attribute[0]);
+            .Returns(Array.Empty<Attribute>());
 
         mockAssembly
             .Setup(a => a.GetCustomAttributes(
                 typeof(FrameworkV2::Microsoft.VisualStudio.TestTools.UnitTesting.TestDataSourceDiscoveryAttribute),
                 true))
-            .Returns(new Attribute[0]);
+            .Returns(Array.Empty<Attribute>());
 
         return mockAssembly;
     }
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/TypeEnumeratorTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/TypeEnumeratorTests.cs
index 7d7c5a7342..a2f3d3b031 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/TypeEnumeratorTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/TypeEnumeratorTests.cs
@@ -453,7 +453,7 @@ public void GetTestFromMethodShouldSetWorkItemIdsToNullIfNotAny()
         SetupTestClassAndTestMethods(isValidTestClass: true, isValidTestMethod: true, isMethodFromSameAssembly: true);
         TypeEnumerator typeEnumerator = GetTypeEnumeratorInstance(typeof(DummyTestClass), "DummyAssemblyName");
         var methodInfo = typeof(DummyTestClass).GetMethod("MethodWithVoidReturnType");
-        _mockReflectHelper.Setup(rh => rh.GetCustomAttributes(methodInfo, typeof(UTF.WorkItemAttribute))).Returns(new Attribute[0]);
+        _mockReflectHelper.Setup(rh => rh.GetCustomAttributes(methodInfo, typeof(UTF.WorkItemAttribute))).Returns(Array.Empty<Attribute>());
 
         var testElement = typeEnumerator.GetTestFromMethod(methodInfo, true, _warnings);
 
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestExecutionManagerTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestExecutionManagerTests.cs
index d08defe17a..58b9393d03 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestExecutionManagerTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestExecutionManagerTests.cs
@@ -972,7 +972,7 @@ public void TestMethod1()
         {
             // Ensures stability.. for the thread to be not used for another test method
             System.Threading.Thread.Sleep(2000);
-            ThreadIds.Add(Thread.CurrentThread.ManagedThreadId);
+            ThreadIds.Add(Environment.CurrentManagedThreadId);
         }
 
         [UTF.TestMethod]
@@ -980,7 +980,7 @@ public void TestMethod2()
         {
             // Ensures stability.. for the thread to be not used for another test method
             System.Threading.Thread.Sleep(2000);
-            ThreadIds.Add(Thread.CurrentThread.ManagedThreadId);
+            ThreadIds.Add(Environment.CurrentManagedThreadId);
         }
     }
 
@@ -999,7 +999,7 @@ public void TestMethod1()
         {
             // Ensures stability.. for the thread to be not used for another test method
             System.Threading.Thread.Sleep(2000);
-            ThreadIds.Add(Thread.CurrentThread.ManagedThreadId);
+            ThreadIds.Add(Environment.CurrentManagedThreadId);
         }
 
         [UTF.TestMethod]
@@ -1007,7 +1007,7 @@ public void TestMethod2()
         {
             // Ensures stability.. for the thread to be not used for another test method
             System.Threading.Thread.Sleep(2000);
-            ThreadIds.Add(Thread.CurrentThread.ManagedThreadId);
+            ThreadIds.Add(Environment.CurrentManagedThreadId);
         }
     }
 
@@ -1026,7 +1026,7 @@ public void TestMethod1()
         {
             // Ensures stability.. for the thread to be not used for another test method
             Thread.Sleep(2000);
-            ThreadIds.Add(Thread.CurrentThread.ManagedThreadId);
+            ThreadIds.Add(Environment.CurrentManagedThreadId);
         }
     }
 
@@ -1058,7 +1058,7 @@ public void TestMethod1()
         {
             // Ensures stability.. for the thread to be not used for another test method
             Thread.Sleep(2000);
-            ParallelizableTestsThreadIds.Add(Thread.CurrentThread.ManagedThreadId);
+            ParallelizableTestsThreadIds.Add(Environment.CurrentManagedThreadId);
             ThreadApartmentStates.Add(Thread.CurrentThread.GetApartmentState());
 
             LastParallelizableTestRun = DateTime.Now;
@@ -1069,7 +1069,7 @@ public void TestMethod2()
         {
             // Ensures stability.. for the thread to be not used for another test method
             Thread.Sleep(2000);
-            ParallelizableTestsThreadIds.Add(Thread.CurrentThread.ManagedThreadId);
+            ParallelizableTestsThreadIds.Add(Environment.CurrentManagedThreadId);
             ThreadApartmentStates.Add(Thread.CurrentThread.GetApartmentState());
 
             LastParallelizableTestRun = DateTime.Now;
@@ -1084,7 +1084,7 @@ public void TestMethod3()
                 FirstUnParallelizableTestRun = DateTime.Now;
             }
 
-            UnParallelizableTestsThreadIds.Add(Thread.CurrentThread.ManagedThreadId);
+            UnParallelizableTestsThreadIds.Add(Environment.CurrentManagedThreadId);
             ThreadApartmentStates.Add(Thread.CurrentThread.GetApartmentState());
         }
 
@@ -1097,7 +1097,7 @@ public void TestMethod4()
                 FirstUnParallelizableTestRun = DateTime.Now;
             }
 
-            UnParallelizableTestsThreadIds.Add(Thread.CurrentThread.ManagedThreadId);
+            UnParallelizableTestsThreadIds.Add(Environment.CurrentManagedThreadId);
             ThreadApartmentStates.Add(Thread.CurrentThread.GetApartmentState());
         }
     }
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodInfoTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodInfoTests.cs
index 444e3b89eb..74d40ee24d 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodInfoTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodInfoTests.cs
@@ -1398,7 +1398,7 @@ public void ResolveArgumentsShouldReturnEmptyParamsWithNoneProvided()
             _testMethodOptions);
 
         object[] arguments = new object[] { 1 };
-        object[] expectedArguments = new object[] { 1, new string[] { } };
+        object[] expectedArguments = new object[] { 1, Array.Empty<string>() };
         var resolvedArguments = method.ResolveArguments(arguments);
 
         Assert.AreEqual(2, resolvedArguments.Length);
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TypeCacheTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TypeCacheTests.cs
index 8e41b180b9..39cb9b65bb 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TypeCacheTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TypeCacheTests.cs
@@ -1183,7 +1183,7 @@ public void GetTestMethodInfoShouldNotAddDuplicateTestPropertiesToTestContext()
     public void GetTestMethodInfoShouldReturnTestMethodInfoForDerivedTestClasses()
     {
         var type = typeof(DerivedTestClass);
-        var methodInfo = type.GetRuntimeMethod("DummyTestMethod", new Type[] { });
+        var methodInfo = type.GetRuntimeMethod("DummyTestMethod", Array.Empty<Type>());
         var testMethod = new TestMethod(methodInfo.Name, type.FullName, "A", isAsync: false);
 
         var testMethodInfo = _typeCache.GetTestMethodInfo(
@@ -1201,7 +1201,7 @@ public void GetTestMethodInfoShouldReturnTestMethodInfoForDerivedTestClasses()
     public void GetTestMethodInfoShouldReturnTestMethodInfoForDerivedClassMethodOverloadByDefault()
     {
         var type = typeof(DerivedTestClass);
-        var methodInfo = type.GetRuntimeMethod("OverloadedTestMethod", new Type[] { });
+        var methodInfo = type.GetRuntimeMethod("OverloadedTestMethod", Array.Empty<Type>());
         var testMethod = new TestMethod(methodInfo.Name, type.FullName, "A", isAsync: false);
 
         var testMethodInfo = _typeCache.GetTestMethodInfo(
@@ -1220,7 +1220,7 @@ public void GetTestMethodInfoShouldReturnTestMethodInfoForDeclaringTypeMethodOve
     {
         var baseType = typeof(BaseTestClass);
         var type = typeof(DerivedTestClass);
-        var methodInfo = baseType.GetRuntimeMethod("OverloadedTestMethod", new Type[] { });
+        var methodInfo = baseType.GetRuntimeMethod("OverloadedTestMethod", Array.Empty<Type>());
         var testMethod = new TestMethod(methodInfo.Name, type.FullName, "A", isAsync: false)
         {
             DeclaringClassFullName = baseType.FullName
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestElementTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestElementTests.cs
index 7c85441fa9..6b36334c0d 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestElementTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/ObjectModel/UnitTestElementTests.cs
@@ -129,7 +129,7 @@ public void ToTestCaseShouldSetTestCategoryIfPresent()
 
         Assert.IsNull(testCase.GetPropertyValue(Constants.TestCategoryProperty));
 
-        _unitTestElement.TestCategory = new string[] { };
+        _unitTestElement.TestCategory = Array.Empty<string>();
         testCase = _unitTestElement.ToTestCase();
 
         Assert.IsNull(testCase.GetPropertyValue(Constants.TestCategoryProperty));
@@ -195,7 +195,7 @@ public void ToTestCaseShouldSetDeploymentItemPropertyIfPresent()
 
         Assert.IsNull(testCase.GetPropertyValue(Constants.DeploymentItemsProperty));
 
-        _unitTestElement.DeploymentItems = new KeyValuePair<string, string>[] { };
+        _unitTestElement.DeploymentItems = Array.Empty<KeyValuePair<string, string>>();
         testCase = _unitTestElement.ToTestCase();
 
         Assert.IsNull(testCase.GetPropertyValue(Constants.DeploymentItemsProperty));
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/TestableImplementations/TestableReflectHelper.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/TestableImplementations/TestableReflectHelper.cs
index e65a431894..d3be41dd15 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/TestableImplementations/TestableReflectHelper.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/TestableImplementations/TestableReflectHelper.cs
@@ -45,9 +45,9 @@ internal override Attribute[] GetCustomAttributeForAssembly(MemberInfo memberInf
     {
         var hashcode = MemberTypes.All.GetHashCode() + type.FullName.GetHashCode();
 
-        if (_customAttributes.ContainsKey(hashcode))
+        if (_customAttributes.TryGetValue(hashcode, out Attribute[] value))
         {
-            return _customAttributes[hashcode];
+            return value;
         }
         else
         {
@@ -59,9 +59,9 @@ internal override Attribute[] GetCustomAttributes(MemberInfo memberInfo, Type ty
     {
         var hashcode = memberInfo.MemberType.GetHashCode() + type.FullName.GetHashCode();
 
-        if (_customAttributes.ContainsKey(hashcode))
+        if (_customAttributes.TryGetValue(hashcode, out Attribute[] value))
         {
-            return _customAttributes[hashcode];
+            return value;
         }
         else
         {
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Deployment/AssemblyLoadWorkerTests.cs b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Deployment/AssemblyLoadWorkerTests.cs
index ba3cbbd963..ef1fda73b0 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Deployment/AssemblyLoadWorkerTests.cs
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Deployment/AssemblyLoadWorkerTests.cs
@@ -138,7 +138,7 @@ public override AssemblyName[] GetReferencedAssemblies()
                 return GetReferencedAssembliesSetter.Invoke();
             }
 
-            return new AssemblyName[] { };
+            return Array.Empty<AssemblyName>();
         }
 
         public string Name
@@ -177,7 +177,7 @@ public override string Location
 
         public override Module[] GetModules(bool getResourceModules)
         {
-            return new Module[] { };
+            return Array.Empty<Module>();
         }
     }
 
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestDeploymentTests.cs b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestDeploymentTests.cs
index 5aab79c007..999d682d50 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestDeploymentTests.cs
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestDeploymentTests.cs
@@ -170,7 +170,7 @@ private TestDeployment CreateAndSetupDeploymentRelatedUtilities(out TestRunDirec
         var mockAssemblyUtility = new Mock<AssemblyUtility>();
         mockAssemblyUtility.Setup(
             au => au.GetFullPathToDependentAssemblies(It.IsAny<string>(), It.IsAny<string>(), out _warnings))
-            .Returns(new string[] { });
+            .Returns(System.Array.Empty<string>());
         mockAssemblyUtility.Setup(
             au => au.GetSatelliteAssemblies(It.IsAny<string>()))
             .Returns(new List<string> { });
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopThreadOperationsTests.cs b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopThreadOperationsTests.cs
index fd889bbb6d..68d3b32557 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopThreadOperationsTests.cs
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopThreadOperationsTests.cs
@@ -33,11 +33,11 @@ public void ExecuteShouldRunActionOnANewThread()
         var cancellationTokenSource = new CancellationTokenSource();
         void action()
         {
-            actionThreadID = Thread.CurrentThread.ManagedThreadId;
+            actionThreadID = Environment.CurrentManagedThreadId;
         }
 
         Assert.IsTrue(_asyncOperations.Execute(action, 1000, cancellationTokenSource.Token));
-        Assert.AreNotEqual(Thread.CurrentThread.ManagedThreadId, actionThreadID);
+        Assert.AreNotEqual(Environment.CurrentManagedThreadId, actionThreadID);
     }
 
     [TestMethod]
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Utilities/DesktopDeploymentUtilityTests.cs b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Utilities/DesktopDeploymentUtilityTests.cs
index 8f43c3855e..d4f65d0692 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Utilities/DesktopDeploymentUtilityTests.cs
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Utilities/DesktopDeploymentUtilityTests.cs
@@ -75,7 +75,7 @@ public void DeployShouldReturnFalseWhenNoDeploymentItemsOnTestCase()
         _mockFileUtility.Setup(fu => fu.DoesFileExist(It.IsAny<string>())).Returns(true);
         _mockAssemblyUtility.Setup(
             au => au.GetFullPathToDependentAssemblies(It.IsAny<string>(), It.IsAny<string>(), out _warnings))
-            .Returns(new string[] { });
+            .Returns(Array.Empty<string>());
         _mockAssemblyUtility.Setup(
             au => au.GetSatelliteAssemblies(It.IsAny<string>()))
             .Returns(new List<string> { });
@@ -99,7 +99,7 @@ public void DeployShouldDeploySourceAndItsConfigFile()
         _mockFileUtility.Setup(fu => fu.DoesFileExist(It.IsAny<string>())).Returns(true);
         _mockAssemblyUtility.Setup(
             au => au.GetFullPathToDependentAssemblies(It.IsAny<string>(), It.IsAny<string>(), out _warnings))
-            .Returns(new string[] { });
+            .Returns(Array.Empty<string>());
         _mockAssemblyUtility.Setup(
             au => au.GetSatelliteAssemblies(It.IsAny<string>()))
             .Returns(new List<string> { });
@@ -183,7 +183,7 @@ public void DeployShouldDeploySatelliteAssemblies()
         _mockFileUtility.Setup(fu => fu.DoesFileExist(It.IsAny<string>())).Returns(true);
         _mockAssemblyUtility.Setup(
             au => au.GetFullPathToDependentAssemblies(It.IsAny<string>(), It.IsAny<string>(), out _warnings))
-            .Returns(new string[] { });
+            .Returns(Array.Empty<string>());
         _mockAssemblyUtility.Setup(
             au => au.GetSatelliteAssemblies(assemblyFullPath))
             .Returns(new List<string> { satelliteFullPath });
@@ -223,7 +223,7 @@ public void DeployShouldNotDeployIfOutputDirectoryIsInvalid()
         _mockFileUtility.Setup(fu => fu.DoesFileExist(It.IsAny<string>())).Returns(true);
         _mockAssemblyUtility.Setup(
             au => au.GetFullPathToDependentAssemblies(It.IsAny<string>(), It.IsAny<string>(), out _warnings))
-            .Returns(new string[] { });
+            .Returns(Array.Empty<string>());
         _mockAssemblyUtility.Setup(
             au => au.GetSatelliteAssemblies(It.IsAny<string>()))
             .Returns(new List<string> { });
@@ -274,7 +274,7 @@ public void DeployShouldDeployContentsOfADirectoryIfSpecified()
         _mockFileUtility.Setup(fu => fu.DoesFileExist(It.IsAny<string>())).Returns(true);
         _mockAssemblyUtility.Setup(
             au => au.GetFullPathToDependentAssemblies(It.IsAny<string>(), It.IsAny<string>(), out _warnings))
-            .Returns(new string[] { });
+            .Returns(Array.Empty<string>());
         _mockFileUtility.Setup(
             fu => fu.AddFilesFromDirectory(DefaultDeploymentItemPath, It.IsAny<bool>())).Returns(directoryContentFiles);
         _mockFileUtility.Setup(
@@ -314,7 +314,7 @@ public void DeployShouldDeployPdbWithSourceIfPdbFileIsPresentInSourceDirectory()
         _mockFileUtility.Setup(fu => fu.DoesFileExist(It.IsAny<string>())).Returns(true);
         _mockAssemblyUtility.Setup(
             au => au.GetFullPathToDependentAssemblies(It.IsAny<string>(), It.IsAny<string>(), out _warnings))
-            .Returns(new string[] { });
+            .Returns(Array.Empty<string>());
         _mockAssemblyUtility.Setup(
             au => au.GetSatelliteAssemblies(It.IsAny<string>()))
             .Returns(new List<string> { });
diff --git a/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/Utilities/ns10FileUtilityTests.cs b/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/Utilities/ns10FileUtilityTests.cs
index 2ee6b6350b..0bb7fc9b47 100644
--- a/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/Utilities/ns10FileUtilityTests.cs
+++ b/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/Utilities/ns10FileUtilityTests.cs
@@ -55,7 +55,7 @@ public void AddFilesInADirectoryShouldReturnAllTopLevelFilesInADirectory()
         var topLevelFiles = new string[] { "tick.txt", "tock.tick.txt" };
 
         _fileUtility.Setup(fu => fu.GetFilesInADirectory(It.IsAny<string>())).Returns(topLevelFiles);
-        _fileUtility.Setup(fu => fu.GetDirectoriesInADirectory(It.IsAny<string>())).Returns(new string[] { });
+        _fileUtility.Setup(fu => fu.GetDirectoriesInADirectory(It.IsAny<string>())).Returns(Array.Empty<string>());
 
         var files = _fileUtility.Object.AddFilesFromDirectory("C:\\randomclock", false);
 
diff --git a/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/ns10ThreadOperationsTests.cs b/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/ns10ThreadOperationsTests.cs
index df56480b0f..1fbca6ee59 100644
--- a/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/ns10ThreadOperationsTests.cs
+++ b/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/ns10ThreadOperationsTests.cs
@@ -37,12 +37,12 @@ public void ExecuteShouldStartTheActionOnANewThread()
         int actionThreadID = 0;
         void action()
         {
-            actionThreadID = Thread.CurrentThread.ManagedThreadId;
+            actionThreadID = Environment.CurrentManagedThreadId;
         }
 
         CancellationTokenSource tokenSource = new();
         Assert.IsTrue(_asyncOperations.Execute(action, 1000, tokenSource.Token));
-        Assert.AreNotEqual(Thread.CurrentThread.ManagedThreadId, actionThreadID);
+        Assert.AreNotEqual(Environment.CurrentManagedThreadId, actionThreadID);
     }
 
     [TestMethod]
diff --git a/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.3/Services/ns13TestDeploymentTests.cs b/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.3/Services/ns13TestDeploymentTests.cs
index 8b06ea7891..6c42475c24 100644
--- a/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.3/Services/ns13TestDeploymentTests.cs
+++ b/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.3/Services/ns13TestDeploymentTests.cs
@@ -528,7 +528,7 @@ private TestDeployment CreateAndSetupDeploymentRelatedUtilities(out TestRunDirec
 #if !NETCOREAPP
         mockAssemblyUtility.Setup(
            au => au.GetFullPathToDependentAssemblies(It.IsAny<string>(), It.IsAny<string>(), out _warnings))
-           .Returns(new string[] { });
+           .Returns(System.Array.Empty<string>());
         mockAssemblyUtility.Setup(
             au => au.GetSatelliteAssemblies(It.IsAny<string>()))
             .Returns(new List<string> { });