diff --git a/build/repo.targets b/build/repo.targets
index 6940b72667..0b665feea7 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -4,12 +4,22 @@
     <MusicStoreE2ETestProject>$(RepositoryRoot)test\MusicStore.E2ETests\MusicStore.E2ETests.csproj</MusicStoreE2ETestProject>
   </PropertyGroup>
 
-  <Target Name="_FilterTestProjects" BeforeTargets="TestProjects" Condition="'$(VSTestTestCaseFilter)'=='E2Etests=NanoServer'">
+  <Target Name="_FilterTestProjects" BeforeTargets="TestProjects" Condition="'$(RUN_TESTS_ON_NANO)'=='true'">
+
+    <Warning Text="Updated test projects to run only the project '$(MusicStoreE2ETestProject)' as the variable 'RUN_TESTS_ON_NANO' is set to '$(RUN_TESTS_ON_NANO)'" />
+
     <ItemGroup>
       <ProjectsToTest Remove="@(ProjectsToTest)" />
       <ProjectsToTest Include="$(MusicStoreE2ETestProject)" />
     </ItemGroup>
 
     <Error Text="Could not find test projects to run" Condition="@(ProjectsToTest->Count()) == 0" />
+
+    <ItemGroup>
+      <ProjectsToTest Update="$(MusicStoreE2ETestProject)">
+        <AdditionalProperties>VSTestTestCaseFilter=E2ETests=NanoServer</AdditionalProperties>
+      </ProjectsToTest>
+    </ItemGroup>
+
   </Target>
 </Project>