diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index c99b3aa0f..ebd644d8f 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -138,7 +138,7 @@ jobs:
       echo "Check clang-formatting"
       brew install clang-format
       clang-format --version
-      find sdk/ -regex '.*\.\(cpp\|hpp\)' -exec clang-format -style=file -i {} \;
+      find ./sdk \( -iname '*.hpp' -o -iname '*.cpp' \) ! -iname 'json.hpp' -exec clang-format -i {} \;
 
       if [[ `git status | grep modified | awk '{print $2}'` ]]; then
         echo Some files were not formatted correctly according to the .clang-format file.
diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp
index 51694e1be..da2298d3d 100644
--- a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp
+++ b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.cpp
@@ -282,7 +282,7 @@ namespace Azure { namespace Storage { namespace Test {
       EXPECT_NO_THROW(pathClient.SetPermissions(pathPermissions, options1));
     }
   }
-  #if 0
+#if 0
   TEST_F(DataLakePathClientTest, LeaseRelated)
   {
     std::string leaseId1 = CreateUniqueLeaseId();
@@ -343,7 +343,7 @@ namespace Azure { namespace Storage { namespace Test {
     options.BreakPeriod = 0;
     m_pathClient->BreakLease(options);
   }
-  #endif
+#endif
   TEST_F(DataLakePathClientTest, ConstructorsWorks)
   {
     {