diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/Common.ps1 b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/Common.ps1
index c68ee77b0029..24c4583cf167 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/Common.ps1
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/Common.ps1
@@ -23,7 +23,11 @@ Get test key name
 #>
 function Get-KeyVault([bool] $haspermission=$true)
 {
-    if ($global:testEnv -eq 'BVT' -and $haspermission)
+    if ($global:testVault -ne "" -and $haspermission)
+    {
+        return $global:testVault
+    }
+    elseif ($global:testEnv -eq 'BVT' -and $haspermission)
     {        
         return 'powershellbvt'
     }
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1 b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1
index 5d3aaa284d66..29b9a529f80d 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1
@@ -4,11 +4,10 @@
   [Parameter(Mandatory=$false,Position=1)]   
   [ValidateSet('ControlPlane','DataPlane', 'All')]
   [string]$TestMode = 'All',  
-  [Parameter(Mandatory=$false,Position=2, ParameterSetName="DPTests")]   
-  [ValidateSet('BVT','PROD')]
-  [string]$TestEnvironment = 'PROD',    
-  [Parameter(Mandatory=$false,Position=2, ParameterSetName="CPTests")]   
-  [string]$Location = 'eastus2'
+  [Parameter(Mandatory=$false,Position=2)]   
+  [string]$Location = 'eastus2',
+  [Parameter(Mandatory=$false, Position=3)]
+  [string]$Vault = ""
 )
 
 $invocationPath = Split-Path $MyInvocation.MyCommand.Definition;
@@ -26,9 +25,10 @@ $global:passedCount = 0;
 $global:passedTests = @()
 $global:failedTests = @()
 $global:times = @{}
-$global:testEnv = $TestEnvironment.ToUpperInvariant()
+$global:testEnv = 'PROD';
 $global:testns = $TestRunNameSpace
 $global:location = $location
+$global:testVault = $Vault
 
 function Run-TestProtected
 {