diff --git a/sdk/storage/assets.json b/sdk/storage/assets.json
index 798123b31..8f3bad25c 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_02a857d53e"
+  "Tag": "cpp/storage_67000ec514"
 }
diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
index 48d94e7fb..2f2bc10be 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
@@ -205,11 +205,13 @@ namespace Azure { namespace Storage { namespace Test {
     }
 
     Azure::Storage::Blobs::ListBlobsOptions options;
-    options.PageSizeHint = 4;
+    options.PageSizeHint = 3;
     std::set<std::string> listBlobs;
+    int numPages = 0;
     for (auto pageResult = containerClient.ListBlobs(options); pageResult.HasPage();
          pageResult.MoveToNextPage())
     {
+      ++numPages;
       EXPECT_FALSE(pageResult.RawResponse->GetHeaders().at(_internal::HttpHeaderRequestId).empty());
       EXPECT_FALSE(pageResult.RawResponse->GetHeaders().at(_internal::HttpHeaderDate).empty());
       EXPECT_FALSE(
@@ -254,6 +256,7 @@ namespace Azure { namespace Storage { namespace Test {
         listBlobs.insert(blob.Name);
       }
     }
+    EXPECT_GT(numPages, 2);
     EXPECT_TRUE(
         std::includes(listBlobs.begin(), listBlobs.end(), p1p2Blobs.begin(), p1p2Blobs.end()));
 
@@ -312,10 +315,13 @@ namespace Azure { namespace Storage { namespace Test {
     for (const auto& p : {prefix1, prefix2})
     {
       options.Prefix = p + delimiter;
+      options.PageSizeHint = 1;
+      int numPages = 0;
       for (auto pageResult = containerClient.ListBlobsByHierarchy(delimiter, options);
            pageResult.HasPage();
            pageResult.MoveToNextPage())
       {
+        ++numPages;
         EXPECT_EQ(pageResult.Delimiter, delimiter);
         EXPECT_EQ(pageResult.Prefix, options.Prefix.Value());
         EXPECT_TRUE(pageResult.BlobPrefixes.empty());
@@ -324,6 +330,7 @@ namespace Azure { namespace Storage { namespace Test {
           items.emplace(i.Name);
         }
       }
+      EXPECT_GT(numPages, 2);
     }
     EXPECT_EQ(items, blobs);
   }
diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp
index 9dc0e4919..c9339eb46 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp
@@ -100,11 +100,13 @@ namespace Azure { namespace Storage { namespace Test {
     }
 
     Azure::Storage::Blobs::ListBlobContainersOptions options;
-    options.PageSizeHint = 4;
+    options.PageSizeHint = 3;
     std::set<std::string> listContainers;
+    int numPages = 0;
     for (auto pageResult = serviceClient.ListBlobContainers(options); pageResult.HasPage();
          pageResult.MoveToNextPage())
     {
+      ++numPages;
       EXPECT_FALSE(pageResult.RawResponse->GetHeaders().at(_internal::HttpHeaderRequestId).empty());
       EXPECT_FALSE(pageResult.RawResponse->GetHeaders().at(_internal::HttpHeaderDate).empty());
       EXPECT_FALSE(
@@ -115,6 +117,7 @@ namespace Azure { namespace Storage { namespace Test {
         listContainers.insert(container.Name);
       }
     }
+    EXPECT_GT(numPages, 2);
     EXPECT_TRUE(std::includes(
         listContainers.begin(),
         listContainers.end(),
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.cpp
index f3c4df44c..f27629f53 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.cpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.cpp
@@ -125,8 +125,14 @@ namespace Azure { namespace Storage { namespace Test {
       // List max result
       Files::DataLake::ListFileSystemsOptions options;
       options.PageSizeHint = 2;
-      auto response = m_dataLakeServiceClient->ListFileSystems(options);
-      EXPECT_LE(2U, response.FileSystems.size());
+      int numPages = 0;
+      for (auto page = m_dataLakeServiceClient->ListFileSystems(options); page.HasPage();
+           page.MoveToNextPage())
+      {
+        EXPECT_LE(page.FileSystems.size(), 2U);
+        ++numPages;
+      }
+      EXPECT_GT(numPages, 2);
     }
     for (const auto& fsName : filesystemSet1)
     {
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.cpp
index b1080e917..32627bbee 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.cpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.cpp
@@ -88,8 +88,14 @@ namespace Azure { namespace Storage { namespace Test {
       // List max result
       Files::Shares::ListSharesOptions options;
       options.PageSizeHint = 2;
-      auto response = m_shareServiceClient->ListShares(options);
-      EXPECT_LE(2U, response.Shares.size());
+      int numPages = 0;
+      for (auto page = m_shareServiceClient->ListShares(options); page.HasPage();
+           page.MoveToNextPage())
+      {
+        EXPECT_LE(page.Shares.size(), 2U);
+        ++numPages;
+      }
+      EXPECT_GT(numPages, 2);
     }
     for (const auto& shareName : shareSet1)
     {
diff --git a/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp b/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp
index cf99b98db..804aacd42 100644
--- a/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp
+++ b/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp
@@ -83,6 +83,7 @@ namespace Azure { namespace Storage { namespace Test {
     Azure::Storage::Queues::ListQueuesOptions options;
     options.PageSizeHint = 4;
     std::set<std::string> listQueues;
+    int numPages = 0;
     for (auto pageResult = m_queueServiceClient->ListQueues(options); pageResult.HasPage();
          pageResult.MoveToNextPage())
     {
@@ -95,7 +96,9 @@ namespace Azure { namespace Storage { namespace Test {
       {
         listQueues.insert(q.Name);
       }
+      ++numPages;
     }
+    EXPECT_GT(numPages, 2);
     EXPECT_TRUE(
         std::includes(listQueues.begin(), listQueues.end(), p1p2Queues.begin(), p1p2Queues.end()));