diff --git a/tools/config/scripts/listAzCdnVersions.ps1 b/tools/config/scripts/listAzCdnVersions.ps1
index b0bd583c9..f20c9e33f 100644
--- a/tools/config/scripts/listAzCdnVersions.ps1
+++ b/tools/config/scripts/listAzCdnVersions.ps1
@@ -61,6 +61,13 @@ Function Get-AllVersionFiles(
     Get-VersionFiles $files "$storagePath" "ai.config." $null
 }
 
+Function Get-AllTestVersionFiles(
+    [system.collections.generic.dictionary[string, system.collections.generic.list[hashtable]]] $files,
+    [string] $storagePath
+) {
+    Get-VersionFiles $files "$storagePath" "ai_test.config." $null
+}
+
 $Error.Clear()
 
 #-----------------------------------------------------------------------------
@@ -96,15 +103,20 @@ if ([string]::IsNullOrWhiteSpace($container) -eq $true) {
     Get-AllVersionFiles $files "scripts/b"
     Get-AllVersionFiles $files "beta"
     Get-AllVersionFiles $files "next"
-    Get-AllVersionFiles $files "dev"
-    Get-AllVersionFiles $files "nightly"
+    #Get-AllVersionFiles $files "dev"
+    Get-AllTestVersionFiles $files "dev"
+    # Get-AllVersionFiles $files "nightly"
+    Get-AllTestVersionFiles $files "nightly"
 }
 
 if ([string]::IsNullOrWhiteSpace($container) -ne $true) {
     if ($container -eq "public") {
         Get-AllVersionFiles $files "scripts/b"
-    } elseif ($container -eq "beta" -or $container -eq "next" -or $container -eq "dev" -or $container -eq "nightly") {
+    } elseif ($container -eq "beta" -or $container -eq "next") {
         Get-AllVersionFiles $files "$container"
+    } elseif ($container -eq "dev" -or $container -eq "nightly") {
+        # Get-AllVersionFiles $files "$container"
+        Get-AllTestVersionFiles $files "$container"
     } else {
         $global:connectDetails.testOnly = $true
         $global:connectDetails.storeContainer = "tst"
diff --git a/tools/config/scripts/setAzActiveCdnVersion.ps1 b/tools/config/scripts/setAzActiveCdnVersion.ps1
index 6c57f9730..4e5684ddb 100644
--- a/tools/config/scripts/setAzActiveCdnVersion.ps1
+++ b/tools/config/scripts/setAzActiveCdnVersion.ps1
@@ -135,6 +135,7 @@ Write-Log "=====================================================================
 
 # List the files for each container
 $files = New-Object 'system.collections.generic.dictionary[string, system.collections.generic.list[hashtable]]'
+$testFiles = New-Object 'system.collections.generic.dictionary[string, system.collections.generic.list[hashtable]]'
 
 $storePath = "$container"
 if ($container -eq "public") {
@@ -145,8 +146,13 @@ if ($container -eq "public") {
 }
 
 Get-VersionFiles $files $storePath "ai.config." $activeVersion
+Get-VersionFiles $testFiles $storePath "ai_test.config." $activeVersion
 
-if ($files.ContainsKey($activeVersion) -ne $true) {
+if ($container -eq "dev" -or $container -eq "nightly") {
+    if ($testFiles.ContainsKey($activeVersion) -ne $true) {
+        Write-LogFailure "Test Version [$activeVersion] does not appear to be deployed to [$container]"
+    }
+} elseif ($files.ContainsKey($activeVersion) -ne $true) {
     Write-LogFailure "Version [$activeVersion] does not appear to be deployed to [$container]"
 } elseif ($files[$activeVersion].Count -ne 1) {          # Since 2.6.5
     Write-LogFailure "Version [$activeVersion] does not fully deployed to [$container] -- only found [$($files[$activeVersion].Count)] file(s)"
@@ -157,6 +163,11 @@ if (Get-HasErrors -eq $true) {
     exit 2
 }
 
-SetActiveVersion $files[$activeVersion] $storePath $minorOnly
+if ($container -eq "dev" -or $container -eq "nightly") {
+    SetActiveVersion $testFiles[$activeVersion] $storePath $minorOnly
+} else {
+    SetActiveVersion $files[$activeVersion] $storePath $minorOnly
+}
+
 
 Write-Log "======================================================================"