diff --git a/src/StorageCache/HPCCache.Test/Fixtures/HpcCacheTestFixture.cs b/src/StorageCache/HPCCache.Test/Fixtures/HpcCacheTestFixture.cs
index 9ed4caa43f2e..b72a2a52b50d 100644
--- a/src/StorageCache/HPCCache.Test/Fixtures/HpcCacheTestFixture.cs
+++ b/src/StorageCache/HPCCache.Test/Fixtures/HpcCacheTestFixture.cs
@@ -66,7 +66,7 @@ public HpcCacheTestFixture()
 
             using (this.Context = new HpcCacheTestContext(callingClassType, mockName))
             {
-                //this.Context = new HpcCacheTestContext(this);
+                this.Context = new HpcCacheTestContext(callingClassType, mockName);
                 try
                 {
                     StorageCacheManagementClient storagecacheMgmtClient = this.Context.GetClient<StorageCacheManagementClient>();
diff --git a/src/StorageCache/HPCCache.Test/Fixtures/StorageAccountFixture.cs b/src/StorageCache/HPCCache.Test/Fixtures/StorageAccountFixture.cs
index 93f6bbb91a13..2cadb89d1abb 100644
--- a/src/StorageCache/HPCCache.Test/Fixtures/StorageAccountFixture.cs
+++ b/src/StorageCache/HPCCache.Test/Fixtures/StorageAccountFixture.cs
@@ -51,7 +51,7 @@ public StorageAccountFixture(HpcCacheTestFixture fixture)
             var mockName = sf.GetMethod().Name;
             using (this.Context = new HpcCacheTestContext(callingClassType, mockName))
             {
-                // this.Context = new HpcCacheTestContext(this);
+                this.Context = new HpcCacheTestContext(callingClassType, mockName);
                 this.StorageTarget = this.AddClfsStorageTarget(this.Context);
                 Match clfsTargetMatch = ClfsTargetRegex.Match(this.StorageTarget.Clfs.Target);
                 var storageAccountName = clfsTargetMatch.Groups["StorageAccountName"].Value;
@@ -212,6 +212,15 @@ public void Dispose()
                 storageTargetName = HpcCacheTestEnvironmentUtilities.StorageTargetName;
             }
 
+            if (string.IsNullOrEmpty(HpcCacheTestEnvironmentUtilities.StorageAccountName))
+            {
+                storageAccountName = string.IsNullOrEmpty(suffix) ? storageAccountName : storageAccountName + suffix;
+            }
+            else
+            {
+                storageAccountName = HpcCacheTestEnvironmentUtilities.StorageAccountName;
+            }
+
             var client = context.GetClient<StorageCacheManagementClient>();
             client.ApiVersion = Constants.DefaultAPIVersion;
             this.fixture.CacheHelper.StoragecacheManagementClient = client;
diff --git a/src/StorageCache/HPCCache.Test/Utilities/Constants.cs b/src/StorageCache/HPCCache.Test/Utilities/Constants.cs
index 1cd33af22d7e..2f5c87cb0775 100644
--- a/src/StorageCache/HPCCache.Test/Utilities/Constants.cs
+++ b/src/StorageCache/HPCCache.Test/Utilities/Constants.cs
@@ -65,5 +65,10 @@ public static class Constants
         /// Storage target name.
         /// </summary>
         // public static readonly string StorageTargetName = "msazure";
+
+        /// <summary>
+        /// Storage account name.
+        /// </summary>
+        public static readonly string StorageAccountName = "romahamu";
     }
 }
diff --git a/src/StorageCache/HPCCache.Test/Utilities/HpcCacheTestEnvironmentUtilities.cs b/src/StorageCache/HPCCache.Test/Utilities/HpcCacheTestEnvironmentUtilities.cs
index 50433cccedce..8036eda83151 100644
--- a/src/StorageCache/HPCCache.Test/Utilities/HpcCacheTestEnvironmentUtilities.cs
+++ b/src/StorageCache/HPCCache.Test/Utilities/HpcCacheTestEnvironmentUtilities.cs
@@ -134,6 +134,24 @@ public static string StorageTargetName
             }
         }
 
+        /// <summary>
+        /// Gets storage account name
+        /// </summary>
+        public static string StorageAccountName
+        {
+            get
+            {
+                try
+                {
+                    return GetValueFromEnvironment("StorageAccountName");
+                }
+                catch (KeyNotFoundException)
+                {
+                    return null;
+                }
+            }
+        }
+
         /// <summary>
         /// Get subscription id.
         /// </summary>