diff --git a/sdk/storage/assets.json b/sdk/storage/assets.json
index 4a1f092393..8ff7997434 100644
--- a/sdk/storage/assets.json
+++ b/sdk/storage/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "cpp",
   "TagPrefix": "cpp/storage",
-  "Tag": "cpp/storage_f7950308da"
+  "Tag": "cpp/storage_75931731d9"
 }
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.cpp
index 0c67743b88..48a76a956b 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.cpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.cpp
@@ -899,10 +899,7 @@ namespace Azure { namespace Storage { namespace Test {
   // cspell:ignore myshare mydirectory
   TEST_F(FileShareDirectoryClientTest, HandlesFunctionalityWorks_PLAYBACKONLY_)
   {
-    auto shareClient = Files::Shares::ShareClient(
-        GetShareUrl("myshare"),
-        GetTestCredential(),
-        InitStorageClientOptions<Files::Shares::ShareClientOptions>());
+    auto shareClient = m_shareServiceClient->GetShareClient("myshare");
     auto directoryClient
         = shareClient.GetRootDirectoryClient().GetSubdirectoryClient("mydirectory");
     Files::Shares::ListDirectoryHandlesOptions options;
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp
index 7130460e7f..505f888c6b 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp
@@ -328,7 +328,7 @@ namespace Azure { namespace Storage { namespace Test {
   TEST_F(FileShareFileClientTest, HandlesFunctionalityWorks_PLAYBACKONLY_)
   {
     auto shareClient = m_shareServiceClient->GetShareClient("myshare");
-    auto fileClient = shareClient.GetRootDirectoryClient().GetFileClient("myfile");
+    auto fileClient = shareClient.GetRootDirectoryClient().GetFileClient("myfile.txt");
     Files::Shares::ListFileHandlesOptions options;
     options.PageSizeHint = 1;
     std::unordered_set<std::string> handles;
@@ -1745,10 +1745,7 @@ namespace Azure { namespace Storage { namespace Test {
   // cspell:ignore myshare myfile
   TEST_F(FileShareFileClientTest, ListHandlesAccessRights_PLAYBACKONLY_)
   {
-    auto shareClient = Files::Shares::ShareClient(
-        GetShareUrl("myshare"),
-        GetTestCredential(),
-        InitStorageClientOptions<Files::Shares::ShareClientOptions>());
+    auto shareClient = m_shareServiceClient->GetShareClient("myshare");
     auto fileClient = shareClient.GetRootDirectoryClient().GetFileClient("myfile");
     auto fileHandles = fileClient.ListHandles().FileHandles;
     Files::Shares::Models::ShareFileHandleAccessRights allAccessRights
@@ -1762,10 +1759,7 @@ namespace Azure { namespace Storage { namespace Test {
 
   TEST_F(FileShareFileClientTest, ListHandlesWithClientName_PLAYBACKONLY_)
   {
-    auto shareClient = Files::Shares::ShareClient(
-        GetShareUrl("myshare"),
-        GetTestCredential(),
-        InitStorageClientOptions<Files::Shares::ShareClientOptions>());
+    auto shareClient = m_shareServiceClient->GetShareClient("myshare");
     auto fileClient
         = shareClient.GetRootDirectoryClient().GetSubdirectoryClient("dir1").GetFileClient(
             "test.txt");