diff --git a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_generated/aio/operations/_file_system_operations.py b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_generated/aio/operations/_file_system_operations.py
index 4adfb744de7e..b6732e350f3b 100644
--- a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_generated/aio/operations/_file_system_operations.py
+++ b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_generated/aio/operations/_file_system_operations.py
@@ -438,7 +438,8 @@ def list_paths(
         error_map.update(kwargs.pop('error_map', {}))
         accept = "application/json"
 
-        def prepare_request(next_link=None):
+        # TODO: change this once continuation/next_link autorest PR is merged
+        def prepare_request(next_link=None, cont_token=None):
             # Construct headers
             header_parameters = {}  # type: Dict[str, Any]
             if request_id_parameter is not None:
@@ -458,8 +459,9 @@ def prepare_request(next_link=None):
                 query_parameters['resource'] = self._serialize.query("self._config.resource", self._config.resource, 'str')
                 if timeout is not None:
                     query_parameters['timeout'] = self._serialize.query("timeout", timeout, 'int', minimum=0)
-                if continuation is not None:
-                    query_parameters['continuation'] = self._serialize.query("continuation", continuation, 'str')
+                # TODO: change this once continuation/next_link autorest PR is merged
+                if cont_token is not None:
+                    query_parameters['continuation'] = self._serialize.query("continuation", cont_token, 'str')
                 if path is not None:
                     query_parameters['directory'] = self._serialize.query("path", path, 'str')
                 query_parameters['recursive'] = self._serialize.query("recursive", recursive, 'bool')
@@ -480,14 +482,21 @@ def prepare_request(next_link=None):
             return request
 
         async def extract_data(pipeline_response):
+            # TODO: change this once continuation/next_link autorest PR is merged
+            try:
+                cont_token = pipeline_response.http_response.headers['x-ms-continuation']
+            except KeyError:
+                cont_token = None
             deserialized = self._deserialize('PathList', pipeline_response)
             list_of_elem = deserialized.paths
             if cls:
                 list_of_elem = cls(list_of_elem)
-            return None, AsyncList(list_of_elem)
+            return cont_token, AsyncList(list_of_elem)
 
-        async def get_next(next_link=None):
-            request = prepare_request(next_link)
+        # TODO: change this once continuation/next_link autorest PR is merged
+        async def get_next(cont_token=None):
+            cont_token = cont_token if not continuation else continuation
+            request = prepare_request(cont_token=cont_token)
 
             pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
             response = pipeline_response.http_response
diff --git a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_generated/operations/_file_system_operations.py b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_generated/operations/_file_system_operations.py
index 69755f47bb76..3726a2dd3cf1 100644
--- a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_generated/operations/_file_system_operations.py
+++ b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_generated/operations/_file_system_operations.py
@@ -172,7 +172,7 @@ def set_properties(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        
+
         _if_modified_since = None
         _if_unmodified_since = None
         if modified_access_conditions is not None:
@@ -340,7 +340,7 @@ def delete(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        
+
         _if_modified_since = None
         _if_unmodified_since = None
         if modified_access_conditions is not None:
@@ -447,7 +447,8 @@ def list_paths(
         error_map.update(kwargs.pop('error_map', {}))
         accept = "application/json"
 
-        def prepare_request(next_link=None):
+        # TODO: change this once continuation/next_link autorest PR is merged
+        def prepare_request(next_link=None, cont_token=None):
             # Construct headers
             header_parameters = {}  # type: Dict[str, Any]
             if request_id_parameter is not None:
@@ -467,8 +468,9 @@ def prepare_request(next_link=None):
                 query_parameters['resource'] = self._serialize.query("self._config.resource", self._config.resource, 'str')
                 if timeout is not None:
                     query_parameters['timeout'] = self._serialize.query("timeout", timeout, 'int', minimum=0)
-                if continuation is not None:
-                    query_parameters['continuation'] = self._serialize.query("continuation", continuation, 'str')
+                # TODO: change this once continuation/next_link autorest PR is merged
+                if cont_token is not None:
+                    query_parameters['continuation'] = self._serialize.query("continuation", cont_token, 'str')
                 if path is not None:
                     query_parameters['directory'] = self._serialize.query("path", path, 'str')
                 query_parameters['recursive'] = self._serialize.query("recursive", recursive, 'bool')
@@ -489,14 +491,22 @@ def prepare_request(next_link=None):
             return request
 
         def extract_data(pipeline_response):
+            # TODO: change this once continuation/next_link autorest PR is merged
+            try:
+                cont_token = pipeline_response.http_response.headers['x-ms-continuation']
+            except KeyError:
+                cont_token = None
             deserialized = self._deserialize('PathList', pipeline_response)
             list_of_elem = deserialized.paths
             if cls:
                 list_of_elem = cls(list_of_elem)
-            return None, iter(list_of_elem)
+            # TODO: change this once continuation/next_link autorest PR is merged
+            return cont_token, iter(list_of_elem)
 
-        def get_next(next_link=None):
-            request = prepare_request(next_link)
+        # TODO: change this once continuation/next_link autorest PR is merged
+        def get_next(cont_token=None):
+            cont_token = cont_token if not continuation else continuation
+            request = prepare_request(cont_token=cont_token)
 
             pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs)
             response = pipeline_response.http_response
diff --git a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_list_paths_pages_correctly.yaml b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_list_paths_pages_correctly.yaml
new file mode 100644
index 000000000000..c59010685b1c
--- /dev/null
+++ b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_list_paths_pages_correctly.yaml
@@ -0,0 +1,666 @@
+interactions:
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/xml
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 1f976315-6803-11eb-af1c-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:18 GMT
+      x-ms-version:
+      - '2020-04-08'
+    method: PUT
+    uri: https://storagename.blob.core.windows.net/fs1e78613f1?restype=container
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:18 GMT
+      ETag:
+      - '"0x8D8CA27040DC66D"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:19 GMT
+      Server:
+      - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - 0cb2d81b-a01e-00d0-030f-fcf70a000000
+      x-ms-version:
+      - '2020-04-08'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 200a3c5f-6803-11eb-a403-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:19 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/dir10?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:19 GMT
+      ETag:
+      - '"0x8D8CA2704886BC6"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fb6-a01f-0056-010f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 2049558a-6803-11eb-878b-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/dir11?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:19 GMT
+      ETag:
+      - '"0x8D8CA2704965DFF"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fb9-a01f-0056-040f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 205738a6-6803-11eb-abf6-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/dir12?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:19 GMT
+      ETag:
+      - '"0x8D8CA2704A65139"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fbd-a01f-0056-070f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 206653b3-6803-11eb-983a-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/dir13?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      ETag:
+      - '"0x8D8CA2704B3ECDD"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fc0-a01f-0056-090f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 20748555-6803-11eb-8281-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/dir14?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      ETag:
+      - '"0x8D8CA2704C13096"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fc2-a01f-0056-0b0f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 20830417-6803-11eb-95b2-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/dir15?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      ETag:
+      - '"0x8D8CA2704D509A7"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fc6-a01f-0056-0e0f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 2096b199-6803-11eb-9286-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/file0?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      ETag:
+      - '"0x8D8CA2704ED1634"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fca-a01f-0056-120f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 20ae6062-6803-11eb-b26d-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/file1?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      ETag:
+      - '"0x8D8CA2705021884"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fcd-a01f-0056-150f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 20c219fe-6803-11eb-94c6-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/file2?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      ETag:
+      - '"0x8D8CA270515FDE4"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:21 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fce-a01f-0056-160f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 20d62bfd-6803-11eb-a139-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:21 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/file3?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      ETag:
+      - '"0x8D8CA2705289F6B"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:21 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fd2-a01f-0056-1a0f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 20ead77f-6803-11eb-ac99-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:21 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/file4?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:20 GMT
+      ETag:
+      - '"0x8D8CA270542B3DA"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:21 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fd7-a01f-0056-1d0f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 2102f9d5-6803-11eb-a569-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:21 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1/file5?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+      Date:
+      - Fri, 05 Feb 2021 22:40:21 GMT
+      ETag:
+      - '"0x8D8CA270559509E"'
+      Last-Modified:
+      - Fri, 05 Feb 2021 22:40:21 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id:
+      - a6f59fdb-a01f-0056-210f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 21194133-6803-11eb-8b14-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:21 GMT
+      x-ms-version:
+      - '2020-02-10'
+    method: GET
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1?resource=filesystem&recursive=true&maxResults=6&upn=true
+  response:
+    body:
+      string: '{"paths":[{"contentLength":"0","creationTime":"132570384201509830","etag":"0x8D8CA2704886BC6","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:20 GMT","name":"dir10","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132570384202423807","etag":"0x8D8CA2704965DFF","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:20 GMT","name":"dir11","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132570384203469113","etag":"0x8D8CA2704A65139","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:20 GMT","name":"dir12","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132570384204360925","etag":"0x8D8CA2704B3ECDD","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:20 GMT","name":"dir13","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132570384205230230","etag":"0x8D8CA2704C13096","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:20 GMT","name":"dir14","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132570384206530983","etag":"0x8D8CA2704D509A7","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:20 GMT","name":"dir15","owner":"$superuser","permissions":"rwxr-x---"}]}
+
+        '
+    headers:
+      Content-Type:
+      - application/json;charset=utf-8
+      Date:
+      - Fri, 05 Feb 2021 22:40:22 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      Transfer-Encoding:
+      - chunked
+      x-ms-continuation:
+      - VBaOza+bv9vU1MABGE4YSS9zZWFucHJvZGhpZXJhcmNoaWNhbAEwMUQ1MkI4MzIyMTJGODBBL2ZzMWU3ODYxM2YxATAxRDZGQzBGRTE5NzQ4MDIvZmlsZTAWAAAA
+      x-ms-request-id:
+      - a6f59fdf-a01f-0056-250f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 2201ef59-6803-11eb-960e-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:22 GMT
+      x-ms-version:
+      - '2020-02-10'
+    method: GET
+    uri: https://storagename.dfs.core.windows.net/fs1e78613f1?resource=filesystem&continuation=VBaOza%2Bbv9vU1MABGE4YSS9zZWFucHJvZGhpZXJhcmNoaWNhbAEwMUQ1MkI4MzIyMTJGODBBL2ZzMWU3ODYxM2YxATAxRDZGQzBGRTE5NzQ4MDIvZmlsZTAWAAAA&recursive=true&maxResults=6&upn=true
+  response:
+    body:
+      string: '{"paths":[{"contentLength":"0","creationTime":"132570384208107060","etag":"0x8D8CA2704ED1634","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:20 GMT","name":"file0","owner":"$superuser","permissions":"rw-r-----"},{"contentLength":"0","creationTime":"132570384209483908","etag":"0x8D8CA2705021884","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:20 GMT","name":"file1","owner":"$superuser","permissions":"rw-r-----"},{"contentLength":"0","creationTime":"132570384210787812","etag":"0x8D8CA270515FDE4","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:21 GMT","name":"file2","owner":"$superuser","permissions":"rw-r-----"},{"contentLength":"0","creationTime":"132570384212008811","etag":"0x8D8CA2705289F6B","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:21 GMT","name":"file3","owner":"$superuser","permissions":"rw-r-----"},{"contentLength":"0","creationTime":"132570384213717978","etag":"0x8D8CA270542B3DA","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:21 GMT","name":"file4","owner":"$superuser","permissions":"rw-r-----"},{"contentLength":"0","creationTime":"132570384215199902","etag":"0x8D8CA270559509E","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:21 GMT","name":"file5","owner":"$superuser","permissions":"rw-r-----"}]}
+
+        '
+    headers:
+      Content-Type:
+      - application/json;charset=utf-8
+      Date:
+      - Fri, 05 Feb 2021 22:40:22 GMT
+      Server:
+      - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      Transfer-Encoding:
+      - chunked
+      x-ms-request-id:
+      - a6f5a01f-a01f-0056-560f-fc3bb3000000
+      x-ms-version:
+      - '2020-02-10'
+    status:
+      code: 200
+      message: OK
+version: 1
diff --git a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_list_paths_with_max_per_page.yaml b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_list_paths_with_max_per_page.yaml
index ca39d7a8340a..3dfba3c5d0cd 100644
--- a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_list_paths_with_max_per_page.yaml
+++ b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_list_paths_with_max_per_page.yaml
@@ -11,13 +11,13 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 2d7b47e9-3f38-11eb-b2b1-c8348e5fffbc
+      - ead19f20-6a49-11eb-a737-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:47 GMT
+      - Mon, 08 Feb 2021 20:12:06 GMT
       x-ms-version:
-      - '2020-02-10'
+      - '2020-04-08'
     method: PUT
     uri: https://storagename.blob.core.windows.net/filesystem117414ae?restype=container
   response:
@@ -27,17 +27,17 @@ interactions:
       Content-Length:
       - '0'
       Date:
-      - Wed, 16 Dec 2020 00:46:51 GMT
+      - Mon, 08 Feb 2021 20:12:07 GMT
       ETag:
-      - '"0x8D8A15C12968D4E"'
+      - '"0x8D8CC6DCF5823CB"'
       Last-Modified:
-      - Wed, 16 Dec 2020 00:46:49 GMT
+      - Mon, 08 Feb 2021 20:12:07 GMT
       Server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       x-ms-request-id:
-      - 64eb4725-b01e-00cc-3a44-d3a56a000000
+      - 593fc202-a01e-008d-7356-fefd8e000000
       x-ms-version:
-      - '2020-02-10'
+      - '2020-04-08'
     status:
       code: 201
       message: Created
@@ -53,11 +53,11 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 30560c2c-3f38-11eb-a2b3-c8348e5fffbc
+      - eb314ec6-6a49-11eb-a444-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:07 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -71,15 +71,15 @@ interactions:
       Content-Length:
       - '0'
       Date:
-      - Wed, 16 Dec 2020 00:46:51 GMT
+      - Mon, 08 Feb 2021 20:12:07 GMT
       ETag:
-      - '"0x8D8A15C144F11E4"'
+      - '"0x8D8CC6DCFAB21BD"'
       Last-Modified:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       Server:
       - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
       x-ms-request-id:
-      - f072468c-401f-005e-2c44-d321bc000000
+      - 943bf8ee-401f-005e-0f56-fe21bc000000
       x-ms-version:
       - '2020-02-10'
     status:
@@ -97,11 +97,11 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 3081d6ff-3f38-11eb-b3a4-c8348e5fffbc
+      - eb6be5bf-6a49-11eb-8b39-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:07 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -115,15 +115,15 @@ interactions:
       Content-Length:
       - '0'
       Date:
-      - Wed, 16 Dec 2020 00:46:51 GMT
+      - Mon, 08 Feb 2021 20:12:07 GMT
       ETag:
-      - '"0x8D8A15C145BE320"'
+      - '"0x8D8CC6DCFB9DBF9"'
       Last-Modified:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       Server:
       - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
       x-ms-request-id:
-      - f0724690-401f-005e-3044-d321bc000000
+      - 943bf8f3-401f-005e-1456-fe21bc000000
       x-ms-version:
       - '2020-02-10'
     status:
@@ -141,11 +141,11 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 308de91a-3f38-11eb-aa88-c8348e5fffbc
+      - eb7a8bc1-6a49-11eb-8798-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:53 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -159,15 +159,15 @@ interactions:
       Content-Length:
       - '0'
       Date:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:07 GMT
       ETag:
-      - '"0x8D8A15C146788F8"'
+      - '"0x8D8CC6DCFCA7BB6"'
       Last-Modified:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       Server:
       - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
       x-ms-request-id:
-      - f0724692-401f-005e-3244-d321bc000000
+      - 943bf8f6-401f-005e-1756-fe21bc000000
       x-ms-version:
       - '2020-02-10'
     status:
@@ -185,11 +185,11 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 309a4542-3f38-11eb-bdc4-c8348e5fffbc
+      - eb8b54a3-6a49-11eb-9a07-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:53 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -203,15 +203,15 @@ interactions:
       Content-Length:
       - '0'
       Date:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       ETag:
-      - '"0x8D8A15C1473E9FE"'
+      - '"0x8D8CC6DCFD90E3A"'
       Last-Modified:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       Server:
       - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
       x-ms-request-id:
-      - f0724694-401f-005e-3444-d321bc000000
+      - 943bf8fc-401f-005e-1d56-fe21bc000000
       x-ms-version:
       - '2020-02-10'
     status:
@@ -229,11 +229,11 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 30a5b754-3f38-11eb-9b7d-c8348e5fffbc
+      - eb99fa8b-6a49-11eb-9bcf-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:53 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -247,15 +247,15 @@ interactions:
       Content-Length:
       - '0'
       Date:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       ETag:
-      - '"0x8D8A15C147F6ED3"'
+      - '"0x8D8CC6DCFE6D142"'
       Last-Modified:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       Server:
       - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
       x-ms-request-id:
-      - f0724696-401f-005e-3644-d321bc000000
+      - 943bf8fd-401f-005e-1e56-fe21bc000000
       x-ms-version:
       - '2020-02-10'
     status:
@@ -273,11 +273,11 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 30b15017-3f38-11eb-b08f-c8348e5fffbc
+      - eba76256-6a49-11eb-8253-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:53 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -291,15 +291,15 @@ interactions:
       Content-Length:
       - '0'
       Date:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       ETag:
-      - '"0x8D8A15C148B44A9"'
+      - '"0x8D8CC6DCFF39CAB"'
       Last-Modified:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       Server:
       - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
       x-ms-request-id:
-      - f0724698-401f-005e-3844-d321bc000000
+      - 943bf8ff-401f-005e-2056-fe21bc000000
       x-ms-version:
       - '2020-02-10'
     status:
@@ -315,35 +315,35 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 30bd2a51-3f38-11eb-89c9-c8348e5fffbc
+      - ebb3d2ac-6a49-11eb-87dd-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:53 GMT
+      - Mon, 08 Feb 2021 20:12:08 GMT
       x-ms-version:
       - '2020-02-10'
     method: GET
     uri: https://storagename.dfs.core.windows.net/filesystem117414ae?resource=filesystem&recursive=true&maxResults=2&upn=true
   response:
     body:
-      string: '{"paths":[{"contentLength":"0","creationTime":"132525532122714596","etag":"0x8D8A15C144F11E4","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:52 GMT","name":"dir10","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132525532123554592","etag":"0x8D8A15C145BE320","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:52 GMT","name":"dir11","owner":"$superuser","permissions":"rwxr-x---"}]}
+      string: '{"paths":[{"contentLength":"0","creationTime":"132572887280525757","etag":"0x8D8CC6DCFAB21BD","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 20:12:08 GMT","name":"dir10","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132572887281490937","etag":"0x8D8CC6DCFB9DBF9","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 20:12:08 GMT","name":"dir11","owner":"$superuser","permissions":"rwxr-x---"}]}
 
         '
     headers:
       Content-Type:
       - application/json;charset=utf-8
       Date:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:09 GMT
       Server:
       - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
       Transfer-Encoding:
       - chunked
       x-ms-continuation:
-      - VBaphI+p6JPb7vIBGFUYUC9zZWFucHJvZGhpZXJhcmNoaWNhbAEwMUQ1MkI4MzIyMTJGODBBL2ZpbGVzeXN0ZW0xMTc0MTRhZQEwMUQ2RDM0NEYwMUZFNDQ0L2RpcjEyFgAAAA==
+      - VBar5amMvaqt4vsBGFUYUC9zZWFucHJvZGhpZXJhcmNoaWNhbAEwMUQ1MkI4MzIyMTJGODBBL2ZpbGVzeXN0ZW0xMTc0MTRhZQEwMUQ2RkU1NkFDRTFDMjhEL2RpcjEyFgAAAA==
       x-ms-request-id:
-      - f072469a-401f-005e-3a44-d321bc000000
+      - 943bf904-401f-005e-2556-fe21bc000000
       x-ms-version:
       - '2020-02-10'
     status:
@@ -359,37 +359,35 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 31006c08-3f38-11eb-9cec-c8348e5fffbc
+      - ecab93c2-6a49-11eb-81a7-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:53 GMT
+      - Mon, 08 Feb 2021 20:12:10 GMT
       x-ms-version:
       - '2020-02-10'
     method: GET
-    uri: https://storagename.dfs.core.windows.net/filesystem117414ae?resource=filesystem&recursive=true&maxResults=4&upn=true
+    uri: https://storagename.dfs.core.windows.net/filesystem117414ae?resource=filesystem&continuation=VBar5amMvaqt4vsBGFUYUC9zZWFucHJvZGhpZXJhcmNoaWNhbAEwMUQ1MkI4MzIyMTJGODBBL2ZpbGVzeXN0ZW0xMTc0MTRhZQEwMUQ2RkU1NkFDRTFDMjhEL2RpcjEyFgAAAA%3D%3D&recursive=true&maxResults=4&upn=true
   response:
     body:
-      string: '{"paths":[{"contentLength":"0","creationTime":"132525532122714596","etag":"0x8D8A15C144F11E4","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:52 GMT","name":"dir10","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132525532123554592","etag":"0x8D8A15C145BE320","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:52 GMT","name":"dir11","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132525532124317944","etag":"0x8D8A15C146788F8","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:52 GMT","name":"dir12","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132525532125129214","etag":"0x8D8A15C1473E9FE","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:52 GMT","name":"dir13","owner":"$superuser","permissions":"rwxr-x---"}]}
+      string: '{"paths":[{"contentLength":"0","creationTime":"132572887282580406","etag":"0x8D8CC6DCFCA7BB6","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 20:12:08 GMT","name":"dir12","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132572887283535418","etag":"0x8D8CC6DCFD90E3A","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 20:12:08 GMT","name":"dir13","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132572887284437314","etag":"0x8D8CC6DCFE6D142","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 20:12:08 GMT","name":"dir14","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132572887285275819","etag":"0x8D8CC6DCFF39CAB","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 20:12:08 GMT","name":"dir15","owner":"$superuser","permissions":"rwxr-x---"}]}
 
         '
     headers:
       Content-Type:
       - application/json;charset=utf-8
       Date:
-      - Wed, 16 Dec 2020 00:46:52 GMT
+      - Mon, 08 Feb 2021 20:12:09 GMT
       Server:
       - Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
       Transfer-Encoding:
       - chunked
-      x-ms-continuation:
-      - VBb7+vDTpuzS41AYVRhQL3NlYW5wcm9kaGllcmFyY2hpY2FsATAxRDUyQjgzMjIxMkY4MEEvZmlsZXN5c3RlbTExNzQxNGFlATAxRDZEMzQ0RjAxRkU0NDQvZGlyMTQWAAAA
       x-ms-request-id:
-      - f07246a0-401f-005e-4044-d321bc000000
+      - 943bf92c-401f-005e-4b56-fe21bc000000
       x-ms-version:
       - '2020-02-10'
     status:
diff --git a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_list_paths_pages_correctly.yaml b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_list_paths_pages_correctly.yaml
new file mode 100644
index 000000000000..078b757d6b5f
--- /dev/null
+++ b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_list_paths_pages_correctly.yaml
@@ -0,0 +1,491 @@
+interactions:
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/xml
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 30ba0fb4-6803-11eb-8fe5-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:47 GMT
+      x-ms-version:
+      - '2020-04-08'
+    method: PUT
+    uri: https://storagename.blob.core.windows.net/filesystem16862166e?restype=container
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:47 GMT
+      ETag: '"0x8D8CA2715072BD9"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:47 GMT
+      Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: aa6d69b3-001e-00ab-220f-fcb596000000
+      x-ms-version: '2020-04-08'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.blob.core.windows.net/filesystem16862166e?restype=container
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 30e1e429-6803-11eb-9fac-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:47 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/dir10?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:47 GMT
+      ETag: '"0x8D8CA27153F868A"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1ef2-001f-0012-640f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/dir10?resource=directory
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 3101b581-6803-11eb-9da8-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/dir11?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:48 GMT
+      ETag: '"0x8D8CA27154537BC"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1ef4-001f-0012-650f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/dir11?resource=directory
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 3106228c-6803-11eb-9294-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/dir12?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:48 GMT
+      ETag: '"0x8D8CA27154999ED"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1ef5-001f-0012-660f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/dir12?resource=directory
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 3109b92d-6803-11eb-8bf5-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/dir13?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:48 GMT
+      ETag: '"0x8D8CA27154D3D13"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1ef6-001f-0012-670f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/dir13?resource=directory
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 310ced7a-6803-11eb-90cf-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/dir14?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:48 GMT
+      ETag: '"0x8D8CA27155059D9"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1ef7-001f-0012-680f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/dir14?resource=directory
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 31110d94-6803-11eb-a0f1-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/dir15?resource=directory
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:48 GMT
+      ETag: '"0x8D8CA2715548804"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1ef8-001f-0012-690f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/dir15?resource=directory
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 3114407e-6803-11eb-929f-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/file0?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:48 GMT
+      ETag: '"0x8D8CA27155BE0F5"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1ef9-001f-0012-6a0f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/file0?resource=file
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 311e527d-6803-11eb-9db7-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/file1?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:48 GMT
+      ETag: '"0x8D8CA2715629337"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1efb-001f-0012-6c0f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/file1?resource=file
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 3122fb2d-6803-11eb-8d15-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/file2?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:48 GMT
+      ETag: '"0x8D8CA27156A8565"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1efc-001f-0012-6d0f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/file2?resource=file
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 312ac341-6803-11eb-b1a4-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/file3?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:48 GMT
+      ETag: '"0x8D8CA27156EDE9D"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1efd-001f-0012-6e0f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/file3?resource=file
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 313179e9-6803-11eb-aa4e-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/file4?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:48 GMT
+      ETag: '"0x8D8CA271576268D"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1efe-001f-0012-6f0f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/file4?resource=file
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 31381df0-6803-11eb-94ae-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-properties:
+      - ''
+      x-ms-version:
+      - '2020-02-10'
+    method: PUT
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e/file5?resource=file
+  response:
+    body:
+      string: ''
+    headers:
+      Content-Length: '0'
+      Date: Fri, 05 Feb 2021 22:40:48 GMT
+      ETag: '"0x8D8CA27157C7BD0"'
+      Last-Modified: Fri, 05 Feb 2021 22:40:48 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      x-ms-request-id: 6b2d1eff-001f-0012-700f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 201
+      message: Created
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e/file5?resource=file
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 313d0007-6803-11eb-8807-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:48 GMT
+      x-ms-version:
+      - '2020-02-10'
+    method: GET
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e?resource=filesystem&recursive=true&maxResults=6&upn=true
+  response:
+    body:
+      string: '{"paths":[{"contentLength":"0","creationTime":"132570384481945226","etag":"0x8D8CA27153F868A","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"dir10","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132570384482318268","etag":"0x8D8CA27154537BC","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"dir11","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132570384482605549","etag":"0x8D8CA27154999ED","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"dir12","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132570384482843923","etag":"0x8D8CA27154D3D13","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"dir13","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132570384483047897","etag":"0x8D8CA27155059D9","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"dir14","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132570384483321860","etag":"0x8D8CA2715548804","group":"$superuser","isDirectory":"true","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"dir15","owner":"$superuser","permissions":"rwxr-x---"}]}
+
+        '
+    headers:
+      Content-Type: application/json;charset=utf-8
+      Date: Fri, 05 Feb 2021 22:40:49 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      Transfer-Encoding: chunked
+      x-ms-continuation: VBbLvOLM87q967wBGFYYUS9zZWFucHJvZGhpZXJhcmNoaWNhbAEwMUQ1MkI4MzIyMTJGODBBL2ZpbGVzeXN0ZW0xNjg2MjE2NmUBMDFENkZDMEZGMjkwNjkxOS9maWxlMBYAAAA=
+      x-ms-request-id: 6b2d1f00-001f-0012-710f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 200
+      message: OK
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e?resource=filesystem&recursive=true&maxResults=6&upn=true
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      x-ms-client-request-id:
+      - 31ebac23-6803-11eb-a752-c8348e5fffbc
+      x-ms-date:
+      - Fri, 05 Feb 2021 22:40:49 GMT
+      x-ms-version:
+      - '2020-02-10'
+    method: GET
+    uri: https://storagename.dfs.core.windows.net/filesystem16862166e?resource=filesystem&continuation=VBbLvOLM87q967wBGFYYUS9zZWFucHJvZGhpZXJhcmNoaWNhbAEwMUQ1MkI4MzIyMTJGODBBL2ZpbGVzeXN0ZW0xNjg2MjE2NmUBMDFENkZDMEZGMjkwNjkxOS9maWxlMBYAAAA%3D&recursive=true&maxResults=6&upn=true
+  response:
+    body:
+      string: '{"paths":[{"contentLength":"0","creationTime":"132570384483803381","etag":"0x8D8CA27155BE0F5","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"file0","owner":"$superuser","permissions":"rw-r-----"},{"contentLength":"0","creationTime":"132570384484242231","etag":"0x8D8CA2715629337","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"file1","owner":"$superuser","permissions":"rw-r-----"},{"contentLength":"0","creationTime":"132570384484762981","etag":"0x8D8CA27156A8565","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"file2","owner":"$superuser","permissions":"rw-r-----"},{"contentLength":"0","creationTime":"132570384485047965","etag":"0x8D8CA27156EDE9D","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"file3","owner":"$superuser","permissions":"rw-r-----"},{"contentLength":"0","creationTime":"132570384485525133","etag":"0x8D8CA271576268D","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"file4","owner":"$superuser","permissions":"rw-r-----"},{"contentLength":"0","creationTime":"132570384485940176","etag":"0x8D8CA27157C7BD0","group":"$superuser","lastModified":"Fri,
+        05 Feb 2021 22:40:48 GMT","name":"file5","owner":"$superuser","permissions":"rw-r-----"}]}
+
+        '
+    headers:
+      Content-Type: application/json;charset=utf-8
+      Date: Fri, 05 Feb 2021 22:40:49 GMT
+      Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
+      Transfer-Encoding: chunked
+      x-ms-request-id: 6b2d1f03-001f-0012-740f-fcb18c000000
+      x-ms-version: '2020-02-10'
+    status:
+      code: 200
+      message: OK
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem16862166e?resource=filesystem&continuation=VBbLvOLM87q967wBGFYYUS9zZWFucHJvZGhpZXJhcmNoaWNhbAEwMUQ1MkI4MzIyMTJGODBBL2ZpbGVzeXN0ZW0xNjg2MjE2NmUBMDFENkZDMEZGMjkwNjkxOS9maWxlMBYAAAA%3D&recursive=true&maxResults=6&upn=true
+version: 1
diff --git a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_list_paths_with_max_per_page_async.yaml b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_list_paths_with_max_per_page_async.yaml
index 782d2edd4e68..83005ec000f7 100644
--- a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_list_paths_with_max_per_page_async.yaml
+++ b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_list_paths_with_max_per_page_async.yaml
@@ -5,13 +5,13 @@ interactions:
       Accept:
       - application/xml
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 26800aea-3f38-11eb-a34e-c8348e5fffbc
+      - 74af8536-6a51-11eb-99b9-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:36 GMT
+      - Mon, 08 Feb 2021 21:06:04 GMT
       x-ms-version:
-      - '2020-02-10'
+      - '2020-04-08'
     method: PUT
     uri: https://storagename.blob.core.windows.net/filesystem2ae119a8?restype=container
   response:
@@ -19,12 +19,12 @@ interactions:
       string: ''
     headers:
       Content-Length: '0'
-      Date: Wed, 16 Dec 2020 00:46:35 GMT
-      ETag: '"0x8D8A15C0A60FB6D"'
-      Last-Modified: Wed, 16 Dec 2020 00:46:35 GMT
+      Date: Mon, 08 Feb 2021 21:06:05 GMT
+      ETag: '"0x8D8CC75592EADCA"'
+      Last-Modified: Mon, 08 Feb 2021 21:06:05 GMT
       Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
-      x-ms-request-id: 0278a1e8-101e-006c-6c44-d321cb000000
-      x-ms-version: '2020-02-10'
+      x-ms-request-id: 6418ee8c-201e-00bc-6c5e-fe1c9d000000
+      x-ms-version: '2020-04-08'
     status:
       code: 201
       message: Created
@@ -35,11 +35,11 @@ interactions:
       Accept:
       - application/json
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 269ae61d-3f38-11eb-b1d8-c8348e5fffbc
+      - 752d2ebf-6a51-11eb-a169-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:36 GMT
+      - Mon, 08 Feb 2021 21:06:05 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -51,11 +51,11 @@ interactions:
       string: ''
     headers:
       Content-Length: '0'
-      Date: Wed, 16 Dec 2020 00:46:35 GMT
-      ETag: '"0x8D8A15C0AC0A3EB"'
-      Last-Modified: Wed, 16 Dec 2020 00:46:36 GMT
+      Date: Mon, 08 Feb 2021 21:06:06 GMT
+      ETag: '"0x8D8CC7559C152F5"'
+      Last-Modified: Mon, 08 Feb 2021 21:06:06 GMT
       Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
-      x-ms-request-id: d684c8e2-601f-00df-1b44-d38166000000
+      x-ms-request-id: 7e8257ce-b01f-00cc-045e-fea56a000000
       x-ms-version: '2020-02-10'
     status:
       code: 201
@@ -67,11 +67,11 @@ interactions:
       Accept:
       - application/json
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 26f46d5b-3f38-11eb-ba59-c8348e5fffbc
+      - 760cb7cc-6a51-11eb-92d2-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:36 GMT
+      - Mon, 08 Feb 2021 21:06:07 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -83,11 +83,11 @@ interactions:
       string: ''
     headers:
       Content-Length: '0'
-      Date: Wed, 16 Dec 2020 00:46:35 GMT
-      ETag: '"0x8D8A15C0AC6F65F"'
-      Last-Modified: Wed, 16 Dec 2020 00:46:36 GMT
+      Date: Mon, 08 Feb 2021 21:06:06 GMT
+      ETag: '"0x8D8CC755A502A9A"'
+      Last-Modified: Mon, 08 Feb 2021 21:06:07 GMT
       Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
-      x-ms-request-id: d684c8e5-601f-00df-1e44-d38166000000
+      x-ms-request-id: 7e82580f-b01f-00cc-455e-fea56a000000
       x-ms-version: '2020-02-10'
     status:
       code: 201
@@ -99,11 +99,11 @@ interactions:
       Accept:
       - application/json
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 26f90154-3f38-11eb-8de0-c8348e5fffbc
+      - 761124a1-6a51-11eb-a846-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:36 GMT
+      - Mon, 08 Feb 2021 21:06:07 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -115,11 +115,11 @@ interactions:
       string: ''
     headers:
       Content-Length: '0'
-      Date: Wed, 16 Dec 2020 00:46:35 GMT
-      ETag: '"0x8D8A15C0ACB4B93"'
-      Last-Modified: Wed, 16 Dec 2020 00:46:36 GMT
+      Date: Mon, 08 Feb 2021 21:06:06 GMT
+      ETag: '"0x8D8CC755A5504E0"'
+      Last-Modified: Mon, 08 Feb 2021 21:06:07 GMT
       Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
-      x-ms-request-id: d684c8e6-601f-00df-1f44-d38166000000
+      x-ms-request-id: 7e825811-b01f-00cc-475e-fea56a000000
       x-ms-version: '2020-02-10'
     status:
       code: 201
@@ -131,11 +131,11 @@ interactions:
       Accept:
       - application/json
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 26fd6e14-3f38-11eb-b93e-c8348e5fffbc
+      - 7614f542-6a51-11eb-bbef-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:36 GMT
+      - Mon, 08 Feb 2021 21:06:07 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -147,11 +147,11 @@ interactions:
       string: ''
     headers:
       Content-Length: '0'
-      Date: Wed, 16 Dec 2020 00:46:35 GMT
-      ETag: '"0x8D8A15C0AD0D163"'
-      Last-Modified: Wed, 16 Dec 2020 00:46:36 GMT
+      Date: Mon, 08 Feb 2021 21:06:06 GMT
+      ETag: '"0x8D8CC755A5886B8"'
+      Last-Modified: Mon, 08 Feb 2021 21:06:07 GMT
       Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
-      x-ms-request-id: d684c8e7-601f-00df-2044-d38166000000
+      x-ms-request-id: 7e825813-b01f-00cc-495e-fea56a000000
       x-ms-version: '2020-02-10'
     status:
       code: 201
@@ -163,11 +163,11 @@ interactions:
       Accept:
       - application/json
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 2702e9d6-3f38-11eb-ad90-c8348e5fffbc
+      - 7619b03b-6a51-11eb-a697-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:37 GMT
+      - Mon, 08 Feb 2021 21:06:07 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -179,11 +179,11 @@ interactions:
       string: ''
     headers:
       Content-Length: '0'
-      Date: Wed, 16 Dec 2020 00:46:35 GMT
-      ETag: '"0x8D8A15C0AD53222"'
-      Last-Modified: Wed, 16 Dec 2020 00:46:36 GMT
+      Date: Mon, 08 Feb 2021 21:06:06 GMT
+      ETag: '"0x8D8CC755A5D43C3"'
+      Last-Modified: Mon, 08 Feb 2021 21:06:07 GMT
       Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
-      x-ms-request-id: d684c8eb-601f-00df-2444-d38166000000
+      x-ms-request-id: 7e825814-b01f-00cc-4a5e-fea56a000000
       x-ms-version: '2020-02-10'
     status:
       code: 201
@@ -195,11 +195,11 @@ interactions:
       Accept:
       - application/json
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 2707a5b4-3f38-11eb-b1cf-c8348e5fffbc
+      - 761df5ed-6a51-11eb-95a8-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:37 GMT
+      - Mon, 08 Feb 2021 21:06:07 GMT
       x-ms-properties:
       - ''
       x-ms-version:
@@ -211,11 +211,11 @@ interactions:
       string: ''
     headers:
       Content-Length: '0'
-      Date: Wed, 16 Dec 2020 00:46:35 GMT
-      ETag: '"0x8D8A15C0ADA3A34"'
-      Last-Modified: Wed, 16 Dec 2020 00:46:36 GMT
+      Date: Mon, 08 Feb 2021 21:06:06 GMT
+      ETag: '"0x8D8CC755A61C265"'
+      Last-Modified: Mon, 08 Feb 2021 21:06:07 GMT
       Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
-      x-ms-request-id: d684c8ef-601f-00df-2844-d38166000000
+      x-ms-request-id: 7e825815-b01f-00cc-4b5e-fea56a000000
       x-ms-version: '2020-02-10'
     status:
       code: 201
@@ -227,29 +227,29 @@ interactions:
       Accept:
       - application/json
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 270c12de-3f38-11eb-b5bd-c8348e5fffbc
+      - 762262b8-6a51-11eb-b6a1-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:37 GMT
+      - Mon, 08 Feb 2021 21:06:07 GMT
       x-ms-version:
       - '2020-02-10'
     method: GET
     uri: https://storagename.dfs.core.windows.net/filesystem2ae119a8?resource=filesystem&recursive=true&maxResults=2&upn=true
   response:
     body:
-      string: '{"paths":[{"contentLength":"0","creationTime":"132525531962385387","etag":"0x8D8A15C0AC0A3EB","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:36 GMT","name":"dir10","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132525531962799711","etag":"0x8D8A15C0AC6F65F","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:36 GMT","name":"dir11","owner":"$superuser","permissions":"rwxr-x---"}]}
+      string: '{"paths":[{"contentLength":"0","creationTime":"132572919662007029","etag":"0x8D8CC7559C152F5","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 21:06:06 GMT","name":"dir10","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132572919671368346","etag":"0x8D8CC755A502A9A","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 21:06:07 GMT","name":"dir11","owner":"$superuser","permissions":"rwxr-x---"}]}
 
         '
     headers:
       Content-Type: application/json;charset=utf-8
-      Date: Wed, 16 Dec 2020 00:46:36 GMT
+      Date: Mon, 08 Feb 2021 21:06:10 GMT
       Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
       Transfer-Encoding: chunked
-      x-ms-continuation: VBb/jfSyv6Kru5QBGFUYUC9zZWFucHJvZGhpZXJhcmNoaWNhbAEwMUQ1MkI4MzIyMTJGODBBL2ZpbGVzeXN0ZW0yYWUxMTlhOAEwMUQ2RDM0NEU3RUEyN0VGL2RpcjEyFgAAAA==
-      x-ms-request-id: d684c8f2-601f-00df-2b44-d38166000000
+      x-ms-continuation: VBaaiJqskrGIyEIYVRhQL3NlYW5wcm9kaGllcmFyY2hpY2FsATAxRDUyQjgzMjIxMkY4MEEvZmlsZXN5c3RlbTJhZTExOWE4ATAxRDZGRTVFMzZCODA4MkUvZGlyMTIWAAAA
+      x-ms-request-id: 7e825819-b01f-00cc-4f5e-fea56a000000
       x-ms-version: '2020-02-10'
     status:
       code: 200
@@ -261,34 +261,33 @@ interactions:
       Accept:
       - application/json
       User-Agent:
-      - azsdk-python-storage-dfs/12.2.0 Python/3.8.5 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-storage-dfs/12.2.3 Python/3.8.5 (Windows-10-10.0.19041-SP0)
       x-ms-client-request-id:
-      - 271d7da6-3f38-11eb-826d-c8348e5fffbc
+      - 78ad9aea-6a51-11eb-b1b2-c8348e5fffbc
       x-ms-date:
-      - Wed, 16 Dec 2020 00:46:37 GMT
+      - Mon, 08 Feb 2021 21:06:11 GMT
       x-ms-version:
       - '2020-02-10'
     method: GET
-    uri: https://storagename.dfs.core.windows.net/filesystem2ae119a8?resource=filesystem&recursive=true&maxResults=4&upn=true
+    uri: https://storagename.dfs.core.windows.net/filesystem2ae119a8?resource=filesystem&continuation=VBaaiJqskrGIyEIYVRhQL3NlYW5wcm9kaGllcmFyY2hpY2FsATAxRDUyQjgzMjIxMkY4MEEvZmlsZXN5c3RlbTJhZTExOWE4ATAxRDZGRTVFMzZCODA4MkUvZGlyMTIWAAAA&recursive=true&maxResults=4&upn=true
   response:
     body:
-      string: '{"paths":[{"contentLength":"0","creationTime":"132525531962385387","etag":"0x8D8A15C0AC0A3EB","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:36 GMT","name":"dir10","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132525531962799711","etag":"0x8D8A15C0AC6F65F","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:36 GMT","name":"dir11","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132525531963083667","etag":"0x8D8A15C0ACB4B93","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:36 GMT","name":"dir12","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132525531963445603","etag":"0x8D8A15C0AD0D163","group":"$superuser","isDirectory":"true","lastModified":"Wed,
-        16 Dec 2020 00:46:36 GMT","name":"dir13","owner":"$superuser","permissions":"rwxr-x---"}]}
+      string: '{"paths":[{"contentLength":"0","creationTime":"132572919671686368","etag":"0x8D8CC755A5504E0","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 21:06:07 GMT","name":"dir12","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132572919671916216","etag":"0x8D8CC755A5886B8","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 21:06:07 GMT","name":"dir13","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132572919672226755","etag":"0x8D8CC755A5D43C3","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 21:06:07 GMT","name":"dir14","owner":"$superuser","permissions":"rwxr-x---"},{"contentLength":"0","creationTime":"132572919672521317","etag":"0x8D8CC755A61C265","group":"$superuser","isDirectory":"true","lastModified":"Mon,
+        08 Feb 2021 21:06:07 GMT","name":"dir15","owner":"$superuser","permissions":"rwxr-x---"}]}
 
         '
     headers:
       Content-Type: application/json;charset=utf-8
-      Date: Wed, 16 Dec 2020 00:46:36 GMT
+      Date: Mon, 08 Feb 2021 21:06:10 GMT
       Server: Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0
       Transfer-Encoding: chunked
-      x-ms-continuation: VBat84vI8d2itjYYVRhQL3NlYW5wcm9kaGllcmFyY2hpY2FsATAxRDUyQjgzMjIxMkY4MEEvZmlsZXN5c3RlbTJhZTExOWE4ATAxRDZEMzQ0RTdFQTI3RUYvZGlyMTQWAAAA
-      x-ms-request-id: d684c8f5-601f-00df-2e44-d38166000000
+      x-ms-request-id: 7e8259aa-b01f-00cc-505e-fea56a000000
       x-ms-version: '2020-02-10'
     status:
       code: 200
       message: OK
-    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem2ae119a8?resource=filesystem&recursive=true&maxResults=4&upn=true
+    url: https://seanprodhierarchical.dfs.core.windows.net/filesystem2ae119a8?resource=filesystem&continuation=VBaaiJqskrGIyEIYVRhQL3NlYW5wcm9kaGllcmFyY2hpY2FsATAxRDUyQjgzMjIxMkY4MEEvZmlsZXN5c3RlbTJhZTExOWE4ATAxRDZGRTVFMzZCODA4MkUvZGlyMTIWAAAA&recursive=true&maxResults=4&upn=true
 version: 1
diff --git a/sdk/storage/azure-storage-file-datalake/tests/test_file_system.py b/sdk/storage/azure-storage-file-datalake/tests/test_file_system.py
index 62a4d6126d4d..f9b6ae738991 100644
--- a/sdk/storage/azure-storage-file-datalake/tests/test_file_system.py
+++ b/sdk/storage/azure-storage-file-datalake/tests/test_file_system.py
@@ -452,6 +452,24 @@ def test_list_paths_recursively(self):
         # there are 24 subpaths in total
         self.assertEqual(len(paths), 24)
 
+    @record
+    def test_list_paths_pages_correctly(self):
+        # Arrange
+        file_system = self._create_file_system(file_system_prefix="fs1")
+        for i in range(0, 6):
+            file_system.create_directory("dir1{}".format(i))
+        for i in range(0, 6):
+            file_system.create_file("file{}".format(i))
+
+        generator = file_system.get_paths(max_results=6, upn=True).by_page()
+        paths1 = list(next(generator))
+        paths2 = list(next(generator))
+        with self.assertRaises(StopIteration):
+            list(next(generator))
+
+        self.assertEqual(len(paths1), 6)
+        self.assertEqual(len(paths2), 6)
+
     @record
     def test_create_directory_from_file_system_client(self):
         # Arrange
diff --git a/sdk/storage/azure-storage-file-datalake/tests/test_file_system_async.py b/sdk/storage/azure-storage-file-datalake/tests/test_file_system_async.py
index a97ccdda1ef3..5567558357ad 100644
--- a/sdk/storage/azure-storage-file-datalake/tests/test_file_system_async.py
+++ b/sdk/storage/azure-storage-file-datalake/tests/test_file_system_async.py
@@ -589,6 +589,35 @@ def test_list_paths_recursively_async(self):
         loop = asyncio.get_event_loop()
         loop.run_until_complete(self._test_list_paths_recursively_async())
 
+    async def _test_list_paths_pages_correctly(self):
+        # Arrange
+        file_system = await self._create_file_system(file_system_prefix="filesystem1")
+        for i in range(0, 6):
+            await file_system.create_directory("dir1{}".format(i))
+        for i in range(0, 6):
+            await file_system.create_file("file{}".format(i))
+
+        generator = file_system.get_paths(max_results=6, upn=True).by_page()
+        paths1 = []
+        async for path in await generator.__anext__():
+            paths1.append(path)
+        paths2 = []
+        async for path in await generator.__anext__():
+            paths2.append(path)
+
+        with self.assertRaises(StopAsyncIteration):
+            paths3 = []
+            async for path in await generator.__anext__():
+                paths3.append(path)
+
+        self.assertEqual(len(paths1), 6)
+        self.assertEqual(len(paths2), 6)
+
+    @record
+    def test_list_paths_pages_correctly(self):
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(self._test_list_paths_pages_correctly())
+
     async def _test_create_directory_from_file_system_client_async(self):
         # Arrange
         file_system = await self._create_file_system()