diff --git a/src/RunTests/RunVSTestTask.cs b/src/RunTests/RunVSTestTask.cs
index 7c36261..eb38991 100644
--- a/src/RunTests/RunVSTestTask.cs
+++ b/src/RunTests/RunVSTestTask.cs
@@ -139,7 +139,15 @@ public class RunVSTestTask : ToolTask
         /// <inheritdoc/>
         protected override string GenerateFullPathToTool()
         {
-            return $@"{Environment.GetEnvironmentVariable("VSINSTALLDIR")}\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe";
+            // Attempt to look in the VS installation dir
+            string vsInstallDir = Environment.GetEnvironmentVariable("VSINSTALLDIR");
+            if (!string.IsNullOrEmpty(vsInstallDir))
+            {
+                return $@"{vsInstallDir}\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe";
+            }
+
+            // Fallback to looking for the tool on the PATH
+            return ToolExe;
         }
 
         /// <inheritdoc/>
diff --git a/src/RunTests/build/Microsoft.Build.RunVSTest.props b/src/RunTests/build/Microsoft.Build.RunVSTest.props
index 9d8b501..bd1fe62 100644
--- a/src/RunTests/build/Microsoft.Build.RunVSTest.props
+++ b/src/RunTests/build/Microsoft.Build.RunVSTest.props
@@ -4,8 +4,8 @@
   
   Licensed under the MIT license.
 -->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
   <PropertyGroup>
-	<UseMSBuildTestInfrastructure Condition="$(UseMSBuildTestInfrastructure)==''">true</UseMSBuildTestInfrastructure>
+    <UseMSBuildTestInfrastructure Condition="'$(UseMSBuildTestInfrastructure)' == ''">true</UseMSBuildTestInfrastructure>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/RunTests/build/Microsoft.Build.RunVSTest.targets b/src/RunTests/build/Microsoft.Build.RunVSTest.targets
index eeeeb29..e4ff39e 100644
--- a/src/RunTests/build/Microsoft.Build.RunVSTest.targets
+++ b/src/RunTests/build/Microsoft.Build.RunVSTest.targets
@@ -4,36 +4,36 @@
   
   Licensed under the MIT license.
 -->
-<Project  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<UsingTask TaskName="Microsoft.Build.RunVSTestTask" AssemblyFile="$(MSBuildThisFileDirectory)netstandard2.0\Microsoft.Build.RunVSTest.dll"  Condition="'$(IsTestProject)' == 'true' and '$(MSBuildRuntime)' != 'Core'"/>
-	<Target Name="RunVSTest" AfterTargets="Test" Condition="'$(IsTestProject)' == 'true' and '$(MSBuildRuntime)' != 'Core'">
-		<RunVSTestTask
-				  TestFileFullPath="$(TargetPath)"
-				  VSTestSetting="$(VSTestSetting)"
-				  VSTestTestAdapterPath="$(VSTestTestAdapterPath)"
-				  VSTestFramework="$(VSTestFramework)"
-				  VSTestPlatform="$(VSTestPlatform)"
-				  VSTestTestCaseFilter="$(VSTestTestCaseFilter)"
-				  VSTestLogger="$(VSTestLogger)"
-				  VSTestListTests="$(VSTestListTests)"
-				  VSTestDiag="$(VSTestDiag)"
-				  VSTestResultsDirectory="$(VSTestResultsDirectory)"
-				  VSTestVerbosity="$(VSTestVerbosity)"
-				  VSTestCollect="$(VSTestCollect)"
-				  VSTestBlame="$(VSTestBlame)"
-				  VSTestBlameCrash="$(VSTestBlameCrash)"
-				  VSTestBlameCrashDumpType="$(VSTestBlameCrashDumpType)"
-				  VSTestBlameCrashCollectAlways="$(VSTestBlameCrashCollectAlways)"
-				  VSTestBlameHang="$(VSTestBlameHang)"
-				  VSTestBlameHangDumpType="$(VSTestBlameHangDumpType)"
-				  VSTestBlameHangTimeout="$(VSTestBlameHangTimeout)"
-				  VSTestTraceDataCollectorDirectoryPath="$(VSTestTraceDataCollectorDirectoryPath)"
-				  VSTestNoLogo="$(VSTestNoLogo)"
-				  VSTestArtifactsProcessingMode="$(VSTestArtifactsProcessingMode)"
-				  VSTestSessionCorrelationId="$(VSTestSessionCorrelationId)"
-	/>
-	</Target>
-	<Target Name="ForceRunVSTest" AfterTargets="Test" Condition="'$(IsTestProject)' == 'true' and '$(MSBuildRuntime)' == 'Core'" >
-		<CallTarget Targets="VSTest" />
-	</Target>
+<Project>
+  <UsingTask TaskName="Microsoft.Build.RunVSTestTask" AssemblyFile="$(MSBuildThisFileDirectory)netstandard2.0\Microsoft.Build.RunVSTest.dll" Condition="'$(IsTestProject)' == 'true' and '$(MSBuildRuntime)' != 'Core'"/>
+  <Target Name="RunVSTest" AfterTargets="Test" Condition="'$(IsTestProject)' == 'true' and '$(MSBuildRuntime)' != 'Core'">
+    <RunVSTestTask ToolExe="$(VSTestToolExe)"
+                   ToolPath="$(VSTestToolPath)"
+                   TestFileFullPath="$(TargetPath)"
+                   VSTestSetting="$(VSTestSetting)"
+                   VSTestTestAdapterPath="$(VSTestTestAdapterPath)"
+                   VSTestFramework="$(VSTestFramework)"
+                   VSTestPlatform="$(VSTestPlatform)"
+                   VSTestTestCaseFilter="$(VSTestTestCaseFilter)"
+                   VSTestLogger="$(VSTestLogger)"
+                   VSTestListTests="$(VSTestListTests)"
+                   VSTestDiag="$(VSTestDiag)"
+                   VSTestResultsDirectory="$(VSTestResultsDirectory)"
+                   VSTestVerbosity="$(VSTestVerbosity)"
+                   VSTestCollect="$(VSTestCollect)"
+                   VSTestBlame="$(VSTestBlame)"
+                   VSTestBlameCrash="$(VSTestBlameCrash)"
+                   VSTestBlameCrashDumpType="$(VSTestBlameCrashDumpType)"
+                   VSTestBlameCrashCollectAlways="$(VSTestBlameCrashCollectAlways)"
+                   VSTestBlameHang="$(VSTestBlameHang)"
+                   VSTestBlameHangDumpType="$(VSTestBlameHangDumpType)"
+                   VSTestBlameHangTimeout="$(VSTestBlameHangTimeout)"
+                   VSTestTraceDataCollectorDirectoryPath="$(VSTestTraceDataCollectorDirectoryPath)"
+                   VSTestNoLogo="$(VSTestNoLogo)"
+                   VSTestArtifactsProcessingMode="$(VSTestArtifactsProcessingMode)"
+                   VSTestSessionCorrelationId="$(VSTestSessionCorrelationId)" />
+  </Target>
+  <Target Name="ForceRunVSTest" AfterTargets="Test" Condition="'$(IsTestProject)' == 'true' and '$(MSBuildRuntime)' == 'Core'" >
+    <CallTarget Targets="VSTest" />
+  </Target>
 </Project>