diff --git a/build/repo.targets b/build/repo.targets
index f0b024c20b..4a4558f304 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -1,50 +1,33 @@
 <Project>
 
   <PropertyGroup>
-    <PrepareDependsOn Condition="'$(MUSICSTORE_ASPNETCORE_STORE_FEED)' != ''">$(PrepareDependsOn);UpdateNuGetConfig</PrepareDependsOn>
     <MusicStoreE2ETestProject>$(RepositoryRoot)test\MusicStore.E2ETests\MusicStore.E2ETests.csproj</MusicStoreE2ETestProject>
   </PropertyGroup>
 
-  <Target Name="UpdateNuGetConfig">
-    <UpdatePackageSource
-      NuGetConfigPath="$(RepositoryRoot)NuGet.config"
-      SourceName="AspNetCoreStore"
-      SourceUri="$(MUSICSTORE_ASPNETCORE_STORE_FEED)" />
+  <Target Name="_FilterTestProjects" BeforeTargets="TestProjects"
+    Condition="'$(RUN_TESTS_ON_NANO)'=='true' Or '$(RUN_RUNTIME_STORE_TESTS)'=='true'">
 
-    <Message Text="Updated NuGet.Config with feed '$(MUSICSTORE_ASPNETCORE_STORE_FEED)'" Importance="High" />
-  </Target>
+    <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)'" Condition="'$(RUN_TESTS_ON_NANO)'=='true'" />
 
-  <Target Name="_RunNanoTestsOnly" 
-      BeforeTargets="TestProjects" 
-      DependsOnTargets="_FilterTestProjects" 
-      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 Update="$(MusicStoreE2ETestProject)">
-        <AdditionalProperties>VSTestTestCaseFilter=E2ETests=NanoServer</AdditionalProperties>
-      </ProjectsToTest>
-    </ItemGroup>
-  </Target>
+    <Warning Text="Updated test projects to run only the project '$(MusicStoreE2ETestProject)' as the variable 'RUN_RUNTIME_STORE_TESTS' is set to '$(RUN_RUNTIME_STORE_TESTS)'" Condition="'$(RUN_RUNTIME_STORE_TESTS)'=='true'" />
 
-  <Target Name="_RunPackageStoreTestsOnly" 
-      BeforeTargets="TestProjects" 
-      DependsOnTargets="_FilterTestProjects" 
-      Condition="'$(MUSICSTORE_ASPNETCORE_STORE_FEED)' != '' ">
-    <Warning Text="Updated test projects to run only the project '$(MusicStoreE2ETestProject)' as the variable 'MUSICSTORE_ASPNETCORE_STORE_FEED' is set to non empty value. Package store tests require to not have RuntimeIdentifiers on MusicStore sample which would fail other standalone tests." />
-    <ItemGroup>
-      <ProjectsToTest Update="$(MusicStoreE2ETestProject)">
-        <AdditionalProperties>VSTestTestCaseFilter=smoketests=usestore</AdditionalProperties>
-      </ProjectsToTest>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_FilterTestProjects">
     <ItemGroup>
       <ProjectsToTest Remove="@(ProjectsToTest)" />
       <ProjectsToTest Include="$(MusicStoreE2ETestProject)" />
     </ItemGroup>
 
     <Error Text="Could not find test projects to run" Condition="@(ProjectsToTest->Count()) == 0" />
-  </Target>
 
+    <ItemGroup Condition="'$(RUN_TESTS_ON_NANO)'=='true'">
+      <ProjectsToTest Update="$(MusicStoreE2ETestProject)">
+        <AdditionalProperties>VSTestTestCaseFilter=E2ETests=NanoServer</AdditionalProperties>
+      </ProjectsToTest>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(RUN_RUNTIME_STORE_TESTS)'=='true'">
+      <ProjectsToTest Update="$(MusicStoreE2ETestProject)">
+        <AdditionalProperties>VSTestTestCaseFilter=smoketests=usestore</AdditionalProperties>
+      </ProjectsToTest>
+    </ItemGroup>
+  </Target>
 </Project>