diff --git a/src/Cli/dotnet/commands/dotnet-test/SolutionAndProjectUtility.cs b/src/Cli/dotnet/commands/dotnet-test/SolutionAndProjectUtility.cs
index f67e3b229a9b..efd259772a06 100644
--- a/src/Cli/dotnet/commands/dotnet-test/SolutionAndProjectUtility.cs
+++ b/src/Cli/dotnet/commands/dotnet-test/SolutionAndProjectUtility.cs
@@ -7,7 +7,6 @@
 using Microsoft.Build.Framework;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Tools.Test;
-using NuGet.Packaging;
 using LocalizableStrings = Microsoft.DotNet.Tools.Test.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli;
@@ -83,13 +82,10 @@ public static (bool SolutionOrProjectFileFound, string Message) TryGetProjectOrS
         }
     }
 
-    private static string[] GetSolutionFilePaths(string directory)
-    {
-        string[] solutionFiles = Directory.GetFiles(directory, CliConstants.SolutionExtensionPattern, SearchOption.TopDirectoryOnly);
-        solutionFiles.AddRange(Directory.GetFiles(directory, CliConstants.SolutionXExtensionPattern, SearchOption.TopDirectoryOnly));
-
-        return solutionFiles;
-    }
+    private static string[] GetSolutionFilePaths(string directory) => [
+            .. Directory.GetFiles(directory, CliConstants.SolutionExtensionPattern, SearchOption.TopDirectoryOnly),
+            .. Directory.GetFiles(directory, CliConstants.SolutionXExtensionPattern, SearchOption.TopDirectoryOnly)
+        ];
 
     private static string[] GetSolutionFilterFilePaths(string directory)
     {
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestApplication.cs b/src/Cli/dotnet/commands/dotnet-test/TestApplication.cs
index 6e3849d43f23..a2a587d9fd29 100644
--- a/src/Cli/dotnet/commands/dotnet-test/TestApplication.cs
+++ b/src/Cli/dotnet/commands/dotnet-test/TestApplication.cs
@@ -307,20 +307,11 @@ private string BuildArgsWithDotnetRun(TestOptions testOptions)
         builder.Append($" {CommonOptions.NoRestoreOption.Name}");
         builder.Append($" {TestingPlatformOptions.NoBuildOption.Name}");
 
-        // TODO: Instead of passing Architecture and Configuration this way, pass _buildOptions.MSBuildArgs
-        // _buildOptions.MSBuildArgs will include all needed global properties.
-        // TODO: Care to be taken when dealing with -bl.
-        // We will want to adjust the file name here.
-
-        if (!string.IsNullOrEmpty(testOptions.Architecture))
+        foreach (var arg in _buildOptions.MSBuildArgs)
         {
-            builder.Append($" {CommonOptions.ArchitectureOption.Name} {testOptions.Architecture}");
+            builder.Append($" {arg}");
         }
 
-        if (!string.IsNullOrEmpty(testOptions.Configuration))
-        {
-            builder.Append($" {TestingPlatformOptions.ConfigurationOption.Name} {testOptions.Configuration}");
-        }
 
         if (!string.IsNullOrEmpty(_module.TargetFramework))
         {