diff --git a/build/Test.targets b/build/Test.targets
index e5a8df3c8..9a49e1edf 100644
--- a/build/Test.targets
+++ b/build/Test.targets
@@ -2,26 +2,26 @@
   <Import Project="test/TestPackageProjects.targets" />
   <Import Project="test/TestProjects.targets" />
 
+  <PropertyGroup>
+    <PathListSeparator>:</PathListSeparator>
+    <PathListSeparator Condition=" '$(OSName)' == 'win' ">%3b</PathListSeparator>
+    <ExecPath>$(Stage2Directory)$(PathListSeparator)$(PATH)</ExecPath>
+    <ExecPath Condition=" '$(OSName)' == 'win' ">$(Stage2Directory)</ExecPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <TestTaskEnvironmentVariables Include="PATH=$(ExecPath)" />
+    <TestTaskEnvironmentVariables Include="TEST_ARTIFACTS=$(TestArtifactsDir)" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <RunTestEnvironmentVariables>@(TestTaskEnvironmentVariables)</RunTestEnvironmentVariables>
+  </PropertyGroup>
+
   <Target Name="Test"
           Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' "
           DependsOnTargets="BuildTests;">
 
-    <PropertyGroup>
-      <PathListSeparator>:</PathListSeparator>
-      <PathListSeparator Condition=" '$(OSName)' == 'win' ">%3b</PathListSeparator>
-      <ExecPath>$(Stage2Directory)$(PathListSeparator)$(PATH)</ExecPath>
-      <ExecPath Condition=" '$(OSName)' == 'win' ">$(Stage2Directory)</ExecPath>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <TestTaskEnvironmentVariables Include="PATH=$(ExecPath)" />
-      <TestTaskEnvironmentVariables Include="TEST_ARTIFACTS=$(TestArtifactsDir)" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <RunTestEnvironmentVariables>@(TestTaskEnvironmentVariables)</RunTestEnvironmentVariables>
-    </PropertyGroup>
-
     <ItemGroup>
       <ProjectsToTest Include="build/test/RunTest.proj">
         <Properties>