diff --git a/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTests.cs b/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTests.cs
index dec486089d65..69ff9ee2db14 100644
--- a/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTests.cs
+++ b/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTests.cs
@@ -31,8 +31,11 @@ public void ClearChallengeCacheforRecord()
         [TearDown]
         public async Task CleanupResourceGroup()
         {
-            var resGroup = await ResourceGroupsClient.StartDeleteAsync(ResGroupName);
-            await WaitForCompletionAsync(resGroup);
+            if (ResGroupName != null)
+            {
+                var resGroup = await ResourceGroupsClient.StartDeleteAsync(ResGroupName);
+                await WaitForCompletionAsync(resGroup);
+            }
         }
 
         [Test]
diff --git a/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTestsBase.cs b/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTestsBase.cs
index 63c0f7e57993..de543985c65a 100644
--- a/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTestsBase.cs
+++ b/sdk/keyvault/Azure.Management.KeyVault/tests/VaultOperationsTestsBase.cs
@@ -77,8 +77,9 @@ protected async Task Initialize()
                 }
                 ).First().Locations.FirstOrDefault();
 
-            ResGroupName = Recording.GenerateAssetName("sdktestrg");
-            await ResourceGroupsClient.CreateOrUpdateAsync(ResGroupName, new Resources.Models.ResourceGroup(Location));
+            var resGroupName = Recording.GenerateAssetName("sdktestrg");
+            await ResourceGroupsClient.CreateOrUpdateAsync(resGroupName, new Resources.Models.ResourceGroup(Location));
+            ResGroupName = resGroupName;
             VaultName = Recording.GenerateAssetName("sdktestvault");
 
             TenantIdGuid = new Guid(TestEnvironment.TenantId);