diff --git a/buildpipeline/windows.groovy b/buildpipeline/windows.groovy
index 2a4e5d30cb14..43018690927b 100644
--- a/buildpipeline/windows.groovy
+++ b/buildpipeline/windows.groovy
@@ -79,7 +79,7 @@ simpleNode('Windows_NT','latest') {
                         targetHelixQueues += ['Windows.10.Nano.Amd64.Open']
                     }
                 } else if (params.TGroup == 'uap' || params.TGroup == 'netfx') {
-                    targetHelixQueues = ['Windows.10.Amd64.ClientRS2.Open']
+                    targetHelixQueues = ['Windows.10.Amd64.ClientRS4.Open']
                 }
 
                 bat "\"%VS140COMNTOOLS%\\VsDevCmd.bat\" && msbuild src\\upload-tests.proj /p:TargetGroup=${params.TGroup} /p:ArchGroup=${params.AGroup} /p:ConfigurationGroup=${params.CGroup} /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:HelixJobType=test/functional/cli/ /p:HelixSource=${helixSource} /p:BuildMoniker=${helixBuild} /p:HelixCreator=${helixCreator} /p:CloudDropAccountName=dotnetbuilddrops /p:CloudResultsAccountName=dotnetjobresults /p:CloudDropAccessToken=%CloudDropAccessToken% /p:CloudResultsAccessToken=%OutputCloudResultsAccessToken% /p:HelixApiEndpoint=https://helix.dot.net/api/2017-04-14/jobs /p:TargetQueues=\"${targetHelixQueues.join(',')}\" /p:HelixLogFolder= /p:HelixLogFolder=${WORKSPACE}\\${logFolder}\\ /p:HelixCorrelationInfoFileName=SubmittedHelixRuns.txt"