diff --git a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp
index f63aed57f..36f4ffbde 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp
@@ -436,9 +436,8 @@ namespace Azure { namespace Storage { namespace Test {
         if (actualDownloadSize >= 0)
         {
           expectedData.assign(
-              m_blobContent.begin() + static_cast<std::ptrdiff_t>(offset.Value()),
-              m_blobContent.begin()
-                  + static_cast<std::ptrdiff_t>(offset.Value() + actualDownloadSize));
+              m_blobContent.begin() + static_cast<ptrdiff_t>(offset.Value()),
+              m_blobContent.begin() + static_cast<ptrdiff_t>(offset.Value() + actualDownloadSize));
         }
         else
         {
@@ -451,8 +450,7 @@ namespace Azure { namespace Storage { namespace Test {
         if (actualDownloadSize >= 0)
         {
           expectedData.assign(
-              m_blobContent.begin() + static_cast<std::ptrdiff_t>(offset.Value()),
-              m_blobContent.end());
+              m_blobContent.begin() + static_cast<ptrdiff_t>(offset.Value()), m_blobContent.end());
         }
         else
         {
@@ -509,9 +507,8 @@ namespace Azure { namespace Storage { namespace Test {
         if (actualDownloadSize >= 0)
         {
           expectedData.assign(
-              m_blobContent.begin() + static_cast<std::ptrdiff_t>(offset.Value()),
-              m_blobContent.begin()
-                  + static_cast<std::ptrdiff_t>(offset.Value() + actualDownloadSize));
+              m_blobContent.begin() + static_cast<ptrdiff_t>(offset.Value()),
+              m_blobContent.begin() + static_cast<ptrdiff_t>(offset.Value() + actualDownloadSize));
         }
         else
         {
@@ -524,8 +521,7 @@ namespace Azure { namespace Storage { namespace Test {
         if (actualDownloadSize >= 0)
         {
           expectedData.assign(
-              m_blobContent.begin() + static_cast<std::ptrdiff_t>(offset.Value()),
-              m_blobContent.end());
+              m_blobContent.begin() + static_cast<ptrdiff_t>(offset.Value()), m_blobContent.end());
         }
         else
         {
diff --git a/sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp
index 33dc903a0..f6e028bbb 100644
--- a/sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp
+++ b/sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp
@@ -418,9 +418,8 @@ namespace Azure { namespace Storage { namespace Test {
         if (actualDownloadSize >= 0)
         {
           expectedData.assign(
-              m_fileContent.begin() + static_cast<std::ptrdiff_t>(offset.Value()),
-              m_fileContent.begin()
-                  + static_cast<std::ptrdiff_t>(offset.Value() + actualDownloadSize));
+              m_fileContent.begin() + static_cast<ptrdiff_t>(offset.Value()),
+              m_fileContent.begin() + static_cast<ptrdiff_t>(offset.Value() + actualDownloadSize));
         }
         else
         {
@@ -433,8 +432,7 @@ namespace Azure { namespace Storage { namespace Test {
         if (actualDownloadSize >= 0)
         {
           expectedData.assign(
-              m_fileContent.begin() + static_cast<std::ptrdiff_t>(offset.Value()),
-              m_fileContent.end());
+              m_fileContent.begin() + static_cast<ptrdiff_t>(offset.Value()), m_fileContent.end());
         }
         else
         {
@@ -489,9 +487,8 @@ namespace Azure { namespace Storage { namespace Test {
         if (actualDownloadSize >= 0)
         {
           expectedData.assign(
-              m_fileContent.begin() + static_cast<std::ptrdiff_t>(offset.Value()),
-              m_fileContent.begin()
-                  + static_cast<std::ptrdiff_t>(offset.Value() + actualDownloadSize));
+              m_fileContent.begin() + static_cast<ptrdiff_t>(offset.Value()),
+              m_fileContent.begin() + static_cast<ptrdiff_t>(offset.Value() + actualDownloadSize));
         }
         else
         {
@@ -504,8 +501,7 @@ namespace Azure { namespace Storage { namespace Test {
         if (actualDownloadSize >= 0)
         {
           expectedData.assign(
-              m_fileContent.begin() + static_cast<std::ptrdiff_t>(offset.Value()),
-              m_fileContent.end());
+              m_fileContent.begin() + static_cast<ptrdiff_t>(offset.Value()), m_fileContent.end());
         }
         else
         {