diff --git a/sdk/storage/azure-storage-blob/tests/test_blob_client.py b/sdk/storage/azure-storage-blob/tests/test_blob_client.py
index 779de264d5b8..a692e799a749 100644
--- a/sdk/storage/azure-storage-blob/tests/test_blob_client.py
+++ b/sdk/storage/azure-storage-blob/tests/test_blob_client.py
@@ -406,6 +406,7 @@ def callback(response):
 
     def test_client_request_id_echo(self):
         # client request id is different for every request, so it will never match the recorded one
+        pytest.skip("Issue tracked here: https://github.com/Azure/azure-sdk-for-python/issues/8098")
         if TestMode.need_recording_file(self.test_mode):
             return
 
diff --git a/sdk/storage/azure-storage-blob/tests/test_logging.py b/sdk/storage/azure-storage-blob/tests/test_logging.py
index 8607e2478c5f..4eed192098a0 100644
--- a/sdk/storage/azure-storage-blob/tests/test_logging.py
+++ b/sdk/storage/azure-storage-blob/tests/test_logging.py
@@ -29,9 +29,9 @@
 )
 
 if sys.version_info >= (3,):
-    from urllib.parse import parse_qs, quote
+    from urllib.parse import parse_qs, quote, urlparse
 else:
-    from urlparse import parse_qs
+    from urlparse import parse_qs, urlparse
     from urllib2 import quote
 
 _AUTHORIZATION_HEADER_NAME = 'Authorization'
@@ -131,7 +131,15 @@ def test_copy_source_sas_is_scrubbed_off(self):
         dest_blob = self.bsc.get_blob_client(self.container_name, dest_blob_name)
 
         # parse out the signed signature
-        token_components = parse_qs(self.source_blob_url)
+        query_parameters = urlparse(self.source_blob_url).query
+        token_components = parse_qs(query_parameters)
+        if QueryStringConstants.SIGNED_SIGNATURE not in token_components:
+            pytest.fail("Blob URL {} doesn't contain {}, parsed query params: {}".format(
+                self.source_blob_url,
+                QueryStringConstants.SIGNED_SIGNATURE,
+                list(token_components.keys())
+            ))
+
         signed_signature = quote(token_components[QueryStringConstants.SIGNED_SIGNATURE][0])
 
         # Act
diff --git a/sdk/storage/azure-storage-blob/tests/test_logging_async.py b/sdk/storage/azure-storage-blob/tests/test_logging_async.py
index b8614f864fb5..d05d8deb3621 100644
--- a/sdk/storage/azure-storage-blob/tests/test_logging_async.py
+++ b/sdk/storage/azure-storage-blob/tests/test_logging_async.py
@@ -37,11 +37,12 @@
 )
 
 if sys.version_info >= (3,):
-    from urllib.parse import parse_qs, quote
+    from urllib.parse import parse_qs, quote, urlparse
 else:
-    from urlparse import parse_qs
+    from urlparse import parse_qs, urlparse
     from urllib2 import quote
 
+
 _AUTHORIZATION_HEADER_NAME = 'Authorization'
 
 
@@ -169,7 +170,15 @@ async def _test_copy_source_sas_is_scrubbed_off(self):
         dest_blob = self.bsc.get_blob_client(self.container_name, dest_blob_name)
 
         # parse out the signed signature
-        token_components = parse_qs(self.source_blob_url)
+        query_parameters = urlparse(self.source_blob_url).query
+        token_components = parse_qs(query_parameters)
+        if QueryStringConstants.SIGNED_SIGNATURE not in token_components:
+            pytest.fail("Blob URL {} doesn't contain {}, parsed query params: {}".format(
+                self.source_blob_url,
+                QueryStringConstants.SIGNED_SIGNATURE,
+                list(token_components.keys())
+            ))
+
         signed_signature = quote(token_components[QueryStringConstants.SIGNED_SIGNATURE][0])
 
         # Act