diff --git a/BenchmarkDotNet.Maui.slnx b/BenchmarkDotNet.Maui.slnx
deleted file mode 100644
index b3e683df87..0000000000
--- a/BenchmarkDotNet.Maui.slnx
+++ /dev/null
@@ -1,14 +0,0 @@
-<Solution>
-  <Configurations>
-    <Platform Name="Any CPU" />
-    <Platform Name="x64" />
-    <Platform Name="x86" />
-  </Configurations>
-  <Folder Name="/samples/">
-    <Project Path="samples/BenchmarkDotNet.Samples.Maui/BenchmarkDotNet.Samples.Maui.csproj" />
-  </Folder>
-  <Folder Name="/src/">
-    <Project Path="src/BenchmarkDotNet.Annotations/BenchmarkDotNet.Annotations.csproj" />
-    <Project Path="src/BenchmarkDotNet/BenchmarkDotNet.csproj" />
-  </Folder>
-</Solution>
diff --git a/samples/BenchmarkDotNet.Maui.slnx b/samples/BenchmarkDotNet.Maui.slnx
new file mode 100644
index 0000000000..679a806ae0
--- /dev/null
+++ b/samples/BenchmarkDotNet.Maui.slnx
@@ -0,0 +1,14 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/samples/">
+    <Project Path="BenchmarkDotNet.Samples.Maui/BenchmarkDotNet.Samples.Maui.csproj" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="../src/BenchmarkDotNet.Annotations/BenchmarkDotNet.Annotations.csproj" />
+    <Project Path="../src/BenchmarkDotNet/BenchmarkDotNet.csproj" />
+  </Folder>
+</Solution>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index dd5ce8b594..30d90012f2 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -4,6 +4,11 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- Set SolutionDir property to suppress warning that raised by Verify.Xunit solution discovery feature. -->
+    <SolutionDir>$([System.IO.Path]::GetDirectoryName($(MSBuildThisFileDirectory)))</SolutionDir>
+  </PropertyGroup>
+
   <!-- ProjectReferences are not transitive, so we need to directly include the analyzers for all test projects. -->
   <ItemGroup Condition="'$(AssemblyName)' != 'BenchmarkDotNet.Analyzers.Tests'">
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\BenchmarkDotNet.Analyzers\BenchmarkDotNet.Analyzers.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />