diff --git a/sdk/storage/azure-storage-file-share/tests/test_share.py b/sdk/storage/azure-storage-file-share/tests/test_share.py
index d7d6ec5fc598..f632cce9f46e 100644
--- a/sdk/storage/azure-storage-file-share/tests/test_share.py
+++ b/sdk/storage/azure-storage-file-share/tests/test_share.py
@@ -814,11 +814,11 @@ def test_list_shares_leased_share(self, **kwargs):
 
         # Act
         lease = share.acquire_lease(lease_id="00000000-1111-2222-3333-444444444444")
-        resp = list(self.fsc.list_shares())
+        resp = [s for s in list(self.fsc.list_shares()) if s.name == share.share_name]
 
         # Assert
         assert resp is not None
-        assert len(resp) >= 1
+        assert len(resp) == 1
         assert resp[0] is not None
         assert resp[0].lease.duration == "infinite"
         assert resp[0].lease.status == "locked"
@@ -935,8 +935,6 @@ def test_list_shares_with_num_results_and_marker(self, **kwargs):
         for i in range(0, 4):
             share_names.append(self._create_share(prefix + str(i)).share_name)
 
-        # share_names.sort()
-
         # Act
         generator1 = self.fsc.list_shares(prefix, results_per_page=2).by_page()
         shares1 = list(next(generator1))
diff --git a/sdk/storage/azure-storage-file-share/tests/test_share_async.py b/sdk/storage/azure-storage-file-share/tests/test_share_async.py
index a89961968b3b..45f6a3704957 100644
--- a/sdk/storage/azure-storage-file-share/tests/test_share_async.py
+++ b/sdk/storage/azure-storage-file-share/tests/test_share_async.py
@@ -816,11 +816,12 @@ async def test_list_shares_leased_share(self, **kwargs):
         lease = await share.acquire_lease(lease_id="00000000-1111-2222-3333-444444444444")
         resp = []
         async for s in self.fsc.list_shares():
-            resp.append(s)
+            if s.name == share.share_name:
+                resp.append(s)
 
         # Assert
         assert resp is not None
-        assert len(resp) >= 1
+        assert len(resp) == 1
         assert resp[0] is not None
         assert resp[0].lease.duration == "infinite"
         assert resp[0].lease.status == "locked"
@@ -944,8 +945,6 @@ async def test_list_shares_with_num_results_and_marker(self, **kwargs):
             share = await self._create_share(prefix + str(i))
             share_names.append(share.share_name)
 
-        share_names.sort()
-
         # Act
         generator1 = self.fsc.list_shares(prefix, results_per_page=2).by_page()
         shares1 = []