diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_error.py b/sdk/tables/azure-data-tables/azure/data/tables/_error.py
index 72e97d1b0587..58bc2dfe51cd 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_error.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_error.py
@@ -17,19 +17,9 @@
 )
 from azure.core.pipeline.policies import ContentDecodePolicy
 
-if sys.version_info < (3,):
-
-    def _str(value):
-        if isinstance(value, unicode):  # pylint: disable=undefined-variable
-            return value.encode("utf-8")
-
-        return str(value)
-else:
-    _str = str
-
 
 def _to_str(value):
-    return _str(value) if value is not None else None
+    return str(value) if value is not None else None
 
 
 _ERROR_TYPE_NOT_SUPPORTED = "Type not supported when sending data to the service: {0}."
@@ -220,6 +210,34 @@ def _process_table_error(storage_error, table_name=None):
     _reraise_error(decoded_error)
 
 
+def _reprocess_error(decoded_error, identifiers=None):
+    error_code = decoded_error.error_code
+    message = decoded_error.message
+    authentication_failed = "Server failed to authenticate the request"
+    invalid_input = "The number of keys specified in the URI does not match number of key properties for the resource"
+    invalid_query_parameter_value = "Value for one of the query parameters specified in the request URI is invalid"
+    invalid_url = "Request url is invalid"
+    properties_need_value = "The values are not specified for all properties in the entity"
+    table_does_not_exist = "The table specified does not exist"
+    if (error_code == "AuthenticationFailed" and authentication_failed in message or # pylint: disable=too-many-boolean-expressions
+        error_code == "InvalidInput" and invalid_input in message or
+        error_code == "InvalidInput" and invalid_url in message or
+        error_code == "InvalidQueryParameterValue" and invalid_query_parameter_value in message or
+        error_code == "PropertiesNeedValue" and properties_need_value in message or
+        error_code =="TableNotFound" and table_does_not_exist in message
+        ):
+        args_list = list(decoded_error.args)
+        args_list[0] += "\nA possible cause of this error could be that the account URL used to"\
+            "create the Client includes an invalid path, for example the table name. Please check your account URL."
+        decoded_error.args = tuple(args_list)
+
+    if (identifiers is not None and error_code == "InvalidXmlDocument" and len(identifiers) > 5):
+        raise ValueError(
+            "Too many access policies provided. The server does not support setting more than 5 access policies"\
+                "on a single resource."
+            )
+
+
 class TableTransactionError(HttpResponseError):
     """There is a failure in the transaction operations.
 
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py b/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py
index b09db8d9e0f7..3e81829644a3 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py
@@ -20,9 +20,10 @@
 from ._deserialize import _convert_to_entity, _trim_service_metadata
 from ._entity import TableEntity
 from ._error import (
+    _decode_error,
     _process_table_error,
+    _reprocess_error,
     _reraise_error,
-    _decode_error,
     _validate_tablename_error
 )
 from ._generated.models import (
@@ -219,21 +220,15 @@ def set_table_access_policy(
                     permission=value.permission
                 )
             identifiers.append(SignedIdentifier(id=key, access_policy=payload))
-        signed_identifiers = identifiers  # type: ignore
         try:
             self._client.table.set_access_policy(
-                table=self.table_name, table_acl=signed_identifiers or None, **kwargs  # type: ignore
+                table=self.table_name, table_acl=identifiers or None, **kwargs  # type: ignore
             )
         except HttpResponseError as error:
             try:
                 _process_table_error(error, table_name=self.table_name)
             except HttpResponseError as table_error:
-                if (table_error.error_code == 'InvalidXmlDocument'  # type: ignore
-                and len(signed_identifiers) > 5):
-                    raise ValueError(
-                        'Too many access policies provided. The server does not support setting '
-                        'more than 5 access policies on a single resource.'
-                    )
+                _reprocess_error(table_error, identifiers=identifiers)
                 raise
 
     @distributed_trace
@@ -260,7 +255,11 @@ def create_table(
         try:
             result = self._client.table.create(table_properties, **kwargs)
         except HttpResponseError as error:
-            _process_table_error(error, table_name=self.table_name)
+            try:
+                _process_table_error(error, table_name=self.table_name)
+            except HttpResponseError as decoded_error:
+                _reprocess_error(decoded_error)
+                raise
         return TableItem(name=result.table_name)  # type: ignore
 
     @distributed_trace
@@ -289,7 +288,11 @@ def delete_table(
         except HttpResponseError as error:
             if error.status_code == 404:
                 return
-            _process_table_error(error, table_name=self.table_name)
+            try:
+                _process_table_error(error, table_name=self.table_name)
+            except HttpResponseError as decoded_error:
+                _reprocess_error(decoded_error)
+                raise
 
     @overload
     def delete_entity(self, partition_key, row_key, **kwargs):
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py b/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py
index d370e43196b5..29c1ad5bc108 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py
@@ -20,7 +20,7 @@
 )
 from ._base_client import parse_connection_str, TablesBaseClient, TransportWrapper
 from ._models import LocationMode
-from ._error import _process_table_error
+from ._error import _process_table_error, _reprocess_error
 from ._table_client import TableClient
 from ._serialize import _parameter_filter_substitution
 
@@ -134,7 +134,11 @@ def get_service_properties(self, **kwargs):
         try:
             service_props = self._client.service.get_properties(timeout=timeout, **kwargs)  # type: ignore
         except HttpResponseError as error:
-            _process_table_error(error)
+            try:
+                _process_table_error(error)
+            except HttpResponseError as decoded_error:
+                _reprocess_error(decoded_error)
+                raise
         return service_properties_deserialize(service_props)
 
     @distributed_trace
@@ -167,7 +171,11 @@ def set_service_properties(self, **kwargs):
         try:
             self._client.service.set_properties(props, **kwargs)
         except HttpResponseError as error:
-            _process_table_error(error)
+            try:
+                _process_table_error(error)
+            except HttpResponseError as decoded_error:
+                _reprocess_error(decoded_error)
+                raise
 
     @distributed_trace
     def create_table(self, table_name, **kwargs):
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py
index de408b999fb1..218cb4908856 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py
@@ -25,8 +25,9 @@
 from .._serialize import serialize_iso, _parameter_filter_substitution, _prepare_key
 from .._deserialize import deserialize_iso, _return_headers_and_deserialized
 from .._error import (
-    _process_table_error,
     _decode_error,
+    _process_table_error,
+    _reprocess_error,
     _reraise_error,
     _validate_tablename_error
 )
@@ -224,12 +225,7 @@ async def set_table_access_policy(
             try:
                 _process_table_error(error, table_name=self.table_name)
             except HttpResponseError as table_error:
-                if (table_error.error_code == 'InvalidXmlDocument'  # type: ignore
-                and len(identifiers) > 5):
-                    raise ValueError(
-                        'Too many access policies provided. The server does not support setting '
-                        'more than 5 access policies on a single resource.'
-                    )
+                _reprocess_error(table_error, identifiers=identifiers)
                 raise
 
     @distributed_trace_async
@@ -253,7 +249,11 @@ async def create_table(self, **kwargs) -> TableItem:
         try:
             result = await self._client.table.create(table_properties, **kwargs)
         except HttpResponseError as error:
-            _process_table_error(error, table_name=self.table_name)
+            try:
+                _process_table_error(error, table_name=self.table_name)
+            except HttpResponseError as decoded_error:
+                _reprocess_error(decoded_error)
+                raise
         return TableItem(name=result.table_name)  # type: ignore
 
     @distributed_trace_async
@@ -279,7 +279,11 @@ async def delete_table(self, **kwargs) -> None:
         except HttpResponseError as error:
             if error.status_code == 404:
                 return
-            _process_table_error(error, table_name=self.table_name)
+            try:
+                _process_table_error(error, table_name=self.table_name)
+            except HttpResponseError as decoded_error:
+                _reprocess_error(decoded_error)
+                raise
 
     @overload
     async def delete_entity(self, partition_key: str, row_key: str, **kwargs: Any) -> None:
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py
index 14c02b23b0c7..77c12d0f4789 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py
@@ -20,7 +20,7 @@
 from .._base_client import parse_connection_str
 from .._generated.models import TableServiceProperties
 from .._models import service_stats_deserialize, service_properties_deserialize
-from .._error import _process_table_error
+from .._error import _process_table_error, _reprocess_error
 from .._models import TableItem, LocationMode
 from .._serialize import _parameter_filter_substitution
 from ._table_client_async import TableClient
@@ -135,7 +135,11 @@ async def get_service_properties(self, **kwargs) -> Dict[str, object]:
         try:
             service_props = await self._client.service.get_properties(timeout=timeout, **kwargs)  # type: ignore
         except HttpResponseError as error:
-            _process_table_error(error)
+            try:
+                _process_table_error(error)
+            except HttpResponseError as decoded_error:
+                _reprocess_error(decoded_error)
+                raise
         return service_properties_deserialize(service_props)
 
     @distributed_trace_async
@@ -174,7 +178,11 @@ async def set_service_properties(
         try:
             await self._client.service.set_properties(props, **kwargs)  # type: ignore
         except HttpResponseError as error:
-            _process_table_error(error)
+            try:
+                _process_table_error(error)
+            except HttpResponseError as decoded_error:
+                _reprocess_error(decoded_error)
+                raise
 
     @distributed_trace_async
     async def create_table(self, table_name: str, **kwargs) -> TableClient:
diff --git a/sdk/tables/azure-data-tables/tests/_shared/asynctestcase.py b/sdk/tables/azure-data-tables/tests/_shared/asynctestcase.py
index 0df8d40645f3..7af03ffed787 100644
--- a/sdk/tables/azure-data-tables/tests/_shared/asynctestcase.py
+++ b/sdk/tables/azure-data-tables/tests/_shared/asynctestcase.py
@@ -20,7 +20,7 @@
 
 from devtools_testutils import is_live
 
-from .testcase import TableTestCase, SLEEP_DELAY
+from .testcase import TableTestCase
 
 
 TEST_TABLE_PREFIX = "pytableasync"
diff --git a/sdk/tables/azure-data-tables/tests/_shared/testcase.py b/sdk/tables/azure-data-tables/tests/_shared/testcase.py
index 7f12ccc8491e..281f1cf3ca9f 100644
--- a/sdk/tables/azure-data-tables/tests/_shared/testcase.py
+++ b/sdk/tables/azure-data-tables/tests/_shared/testcase.py
@@ -30,8 +30,6 @@
 
 from devtools_testutils import is_live
 
-SLEEP_DELAY = 30
-
 TEST_TABLE_PREFIX = "pytablesync"
 
 SERVICE_UNAVAILABLE_RESP_BODY = '<?xml version="1.0" encoding="utf-8"?><StorageServiceStats><GeoReplication><Status' \
diff --git a/sdk/tables/azure-data-tables/tests/recordings/test_table_client.pyTestTableClienttest_client_with_url_ends_with_table_name.json b/sdk/tables/azure-data-tables/tests/recordings/test_table_client.pyTestTableClienttest_client_with_url_ends_with_table_name.json
new file mode 100644
index 000000000000..b94332ef23b6
--- /dev/null
+++ b/sdk/tables/azure-data-tables/tests/recordings/test_table_client.pyTestTableClienttest_client_with_url_ends_with_table_name.json
@@ -0,0 +1,227 @@
+{
+  "Entries": [
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable57b32f31/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:08:20 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:08:20 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable57b32f31"
+      },
+      "StatusCode": 404,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:08:17 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "TableNotFound",
+          "message": {
+            "lang": "en-US",
+            "value": "The table specified does not exist.\nRequestId:eddddffc-5002-0009-6b8a-bc7862000000\nTime:2022-08-30T16:08:18.2443389Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable57b32f31/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "33",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:08:20 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:08:20 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable257b32f31"
+      },
+      "StatusCode": 404,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:08:17 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "TableNotFound",
+          "message": {
+            "lang": "en-US",
+            "value": "The table specified does not exist.\nRequestId:eddde002-5002-0009-6f8a-bc7862000000\nTime:2022-08-30T16:08:18.3073029Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:08:20 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:08:20 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable57b32f31"
+      },
+      "StatusCode": 201,
+      "ResponseHeaders": {
+        "Cache-Control": "no-cache",
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:08:17 GMT",
+        "Location": "https://fakeendpoint.table.core.windows.net/Tables(\u0027mytable57b32f31\u0027)",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.metadata": "https://fakeendpoint.table.core.windows.net/$metadata#Tables/@Element",
+        "TableName": "mytable57b32f31"
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable57b32f31/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:08:21 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:08:21 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable57b32f31"
+      },
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Cache-Control": "no-cache",
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:08:17 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "PropertiesNeedValue",
+          "message": {
+            "lang": "en-US",
+            "value": "The values are not specified for all properties in the entity.\nRequestId:eddde00e-5002-0009-798a-bc7862000000\nTime:2022-08-30T16:08:18.4402263Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable57b32f31/Tables(\u0027mytable57b32f31\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "0",
+        "Date": "Tue, 30 Aug 2022 16:08:21 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:08:21 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:08:17 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "InvalidInput",
+          "message": {
+            "lang": "en-US",
+            "value": "The number of keys specified in the URI does not match number of key properties for the resource \u0027faketableaccount.mytable57b32f31\u0027.\nRequestId:eddde018-5002-0009-028a-bc7862000000\nTime:2022-08-30T16:08:18.4712102Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/Tables(\u0027mytable57b32f31\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "0",
+        "Date": "Tue, 30 Aug 2022 16:08:21 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:08:21 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 204,
+      "ResponseHeaders": {
+        "Cache-Control": "no-cache",
+        "Content-Length": "0",
+        "Date": "Tue, 30 Aug 2022 16:08:17 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": null
+    }
+  ],
+  "Variables": {}
+}
diff --git a/sdk/tables/azure-data-tables/tests/recordings/test_table_client_async.pyTestTableClientAsynctest_client_with_url_ends_with_table_name.json b/sdk/tables/azure-data-tables/tests/recordings/test_table_client_async.pyTestTableClientAsynctest_client_with_url_ends_with_table_name.json
new file mode 100644
index 000000000000..dd9cf138e999
--- /dev/null
+++ b/sdk/tables/azure-data-tables/tests/recordings/test_table_client_async.pyTestTableClientAsynctest_client_with_url_ends_with_table_name.json
@@ -0,0 +1,221 @@
+{
+  "Entries": [
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable88ae33ac/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable88ae33ac"
+      },
+      "StatusCode": 404,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:09:28 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "TableNotFound",
+          "message": {
+            "lang": "en-US",
+            "value": "The table specified does not exist.\nRequestId:0be7b206-5002-0019-2b8a-bcbd0a000000\nTime:2022-08-30T16:09:29.1095454Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable88ae33ac/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "33",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable288ae33ac"
+      },
+      "StatusCode": 404,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:09:28 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "TableNotFound",
+          "message": {
+            "lang": "en-US",
+            "value": "The table specified does not exist.\nRequestId:0be7b214-5002-0019-368a-bcbd0a000000\nTime:2022-08-30T16:09:29.1625161Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable88ae33ac"
+      },
+      "StatusCode": 201,
+      "ResponseHeaders": {
+        "Cache-Control": "no-cache",
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:09:28 GMT",
+        "Location": "https://fakeendpoint.table.core.windows.net/Tables(\u0027mytable88ae33ac\u0027)",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.metadata": "https://fakeendpoint.table.core.windows.net/$metadata#Tables/@Element",
+        "TableName": "mytable88ae33ac"
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable88ae33ac/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable88ae33ac"
+      },
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Cache-Control": "no-cache",
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:09:28 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "PropertiesNeedValue",
+          "message": {
+            "lang": "en-US",
+            "value": "The values are not specified for all properties in the entity.\nRequestId:0be7b224-5002-0019-428a-bcbd0a000000\nTime:2022-08-30T16:09:29.2334744Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable88ae33ac/Tables(\u0027mytable88ae33ac\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "0",
+        "Date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:09:28 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "InvalidInput",
+          "message": {
+            "lang": "en-US",
+            "value": "The number of keys specified in the URI does not match number of key properties for the resource \u0027faketableaccount.mytable88ae33ac\u0027.\nRequestId:0be7b22b-5002-0019-488a-bcbd0a000000\nTime:2022-08-30T16:09:29.2634570Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/Tables(\u0027mytable88ae33ac\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "0",
+        "Date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:09:31 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 204,
+      "ResponseHeaders": {
+        "Cache-Control": "no-cache",
+        "Content-Length": "0",
+        "Date": "Tue, 30 Aug 2022 16:09:28 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": null
+    }
+  ],
+  "Variables": {}
+}
diff --git a/sdk/tables/azure-data-tables/tests/recordings/test_table_cosmos.pyTestTableCosmostest_client_with_url_ends_with_table_name.json b/sdk/tables/azure-data-tables/tests/recordings/test_table_cosmos.pyTestTableCosmostest_client_with_url_ends_with_table_name.json
new file mode 100644
index 000000000000..44b86aea733d
--- /dev/null
+++ b/sdk/tables/azure-data-tables/tests/recordings/test_table_cosmos.pyTestTableCosmostest_client_with_url_ends_with_table_name.json
@@ -0,0 +1,189 @@
+{
+  "Entries": [
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/mytable622b2f5b/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:30:41 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:41 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable622b2f5b"
+      },
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=fullmetadata",
+        "Date": "Tue, 27 Sep 2022 07:30:38 GMT",
+        "Transfer-Encoding": "chunked"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "InvalidInput",
+          "message": {
+            "lang": "en-us",
+            "value": "Request url is invalid.\r\nActivityId: 58d77aa2-a6d6-40f7-98d2-0b62defb0577, documentdb-dotnet-sdk/2.14.0 Host/64-bit MicrosoftWindowsNT/10.0.19041.0\nRequestID:58d77aa2-a6d6-40f7-98d2-0b62defb0577\n"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/mytable622b2f5b/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "33",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:30:42 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:42 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable2622b2f5b"
+      },
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=fullmetadata",
+        "Date": "Tue, 27 Sep 2022 07:30:38 GMT",
+        "Transfer-Encoding": "chunked"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "InvalidInput",
+          "message": {
+            "lang": "en-us",
+            "value": "Request url is invalid.\r\nActivityId: 91e54f2e-5841-4990-86f2-99282972f68b, documentdb-dotnet-sdk/2.14.0 Host/64-bit MicrosoftWindowsNT/10.0.19041.0\nRequestID:91e54f2e-5841-4990-86f2-99282972f68b\n"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:30:42 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:42 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable622b2f5b"
+      },
+      "StatusCode": 201,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata",
+        "Date": "Tue, 27 Sep 2022 07:30:38 GMT",
+        "ETag": "W/\u0022datetime\u00272022-09-27T07%3A30%3A39.6279815Z\u0027\u0022",
+        "Location": "https://fakeendpoint.table.cosmos.azure.com/Tables(\u0027mytable622b2f5b\u0027)",
+        "Transfer-Encoding": "chunked"
+      },
+      "ResponseBody": {
+        "TableName": "mytable622b2f5b",
+        "odata.metadata": "https://fakeendpoint.table.cosmos.azure.com/$metadata#Tables/@Element"
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/mytable622b2f5b/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:30:42 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:42 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable622b2f5b"
+      },
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=fullmetadata",
+        "Date": "Tue, 27 Sep 2022 07:30:39 GMT",
+        "Transfer-Encoding": "chunked"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "InvalidInput",
+          "message": {
+            "lang": "en-us",
+            "value": "Request url is invalid.\r\nActivityId: f0bc8fd8-2cb3-4ca2-afcb-548093b74ed1, documentdb-dotnet-sdk/2.14.0 Host/64-bit MicrosoftWindowsNT/10.0.19041.0\nRequestID:f0bc8fd8-2cb3-4ca2-afcb-548093b74ed1\n"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/mytable622b2f5b/Tables(\u0027mytable622b2f5b\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "0",
+        "Date": "Tue, 27 Sep 2022 07:30:42 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:42 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=fullmetadata",
+        "Date": "Tue, 27 Sep 2022 07:30:39 GMT",
+        "Transfer-Encoding": "chunked"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "InvalidInput",
+          "message": {
+            "lang": "en-us",
+            "value": "Request url is invalid.\r\nActivityId: bd0f4833-0418-4da5-ba33-eca6b8e72e3e, documentdb-dotnet-sdk/2.14.0 Host/64-bit MicrosoftWindowsNT/10.0.19041.0\nRequestID:bd0f4833-0418-4da5-ba33-eca6b8e72e3e\n"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/Tables(\u0027mytable622b2f5b\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "0",
+        "Date": "Tue, 27 Sep 2022 07:30:42 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:42 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 204,
+      "ResponseHeaders": {
+        "Content-Type": "application/json",
+        "Date": "Tue, 27 Sep 2022 07:30:39 GMT"
+      },
+      "ResponseBody": null
+    }
+  ],
+  "Variables": {}
+}
diff --git a/sdk/tables/azure-data-tables/tests/recordings/test_table_cosmos_async.pyTestTableCosmosAsynctest_client_with_url_ends_with_table_name.json b/sdk/tables/azure-data-tables/tests/recordings/test_table_cosmos_async.pyTestTableCosmosAsynctest_client_with_url_ends_with_table_name.json
new file mode 100644
index 000000000000..0cd4fb42701b
--- /dev/null
+++ b/sdk/tables/azure-data-tables/tests/recordings/test_table_cosmos_async.pyTestTableCosmosAsynctest_client_with_url_ends_with_table_name.json
@@ -0,0 +1,183 @@
+{
+  "Entries": [
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/mytable947633d6/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:30:27 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:27 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable947633d6"
+      },
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=fullmetadata",
+        "Date": "Tue, 27 Sep 2022 07:30:24 GMT",
+        "Transfer-Encoding": "chunked"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "InvalidInput",
+          "message": {
+            "lang": "en-us",
+            "value": "Request url is invalid.\r\nActivityId: 4580b19e-8949-4e27-b69b-51eae56deb7c, documentdb-dotnet-sdk/2.14.0 Host/64-bit MicrosoftWindowsNT/10.0.19041.0\nRequestID:4580b19e-8949-4e27-b69b-51eae56deb7c\n"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/mytable947633d6/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "33",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:30:27 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:27 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable2947633d6"
+      },
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=fullmetadata",
+        "Date": "Tue, 27 Sep 2022 07:30:24 GMT",
+        "Transfer-Encoding": "chunked"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "InvalidInput",
+          "message": {
+            "lang": "en-us",
+            "value": "Request url is invalid.\r\nActivityId: 12e66836-81e8-48c9-8353-d546cbbf4399, documentdb-dotnet-sdk/2.14.0 Host/64-bit MicrosoftWindowsNT/10.0.19041.0\nRequestID:12e66836-81e8-48c9-8353-d546cbbf4399\n"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:30:27 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:27 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable947633d6"
+      },
+      "StatusCode": 201,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata",
+        "Date": "Tue, 27 Sep 2022 07:30:24 GMT",
+        "ETag": "W/\u0022datetime\u00272022-09-27T07%3A30%3A25.1276295Z\u0027\u0022",
+        "Location": "https://fakeendpoint.table.cosmos.azure.com/Tables(\u0027mytable947633d6\u0027)",
+        "Transfer-Encoding": "chunked"
+      },
+      "ResponseBody": {
+        "TableName": "mytable947633d6",
+        "odata.metadata": "https://fakeendpoint.table.cosmos.azure.com/$metadata#Tables/@Element"
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/mytable947633d6/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:30:28 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:28 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable947633d6"
+      },
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=fullmetadata",
+        "Date": "Tue, 27 Sep 2022 07:30:24 GMT",
+        "Transfer-Encoding": "chunked"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "InvalidInput",
+          "message": {
+            "lang": "en-us",
+            "value": "Request url is invalid.\r\nActivityId: 7480484b-ea0c-4274-97d7-7f330da9cd24, documentdb-dotnet-sdk/2.14.0 Host/64-bit MicrosoftWindowsNT/10.0.19041.0\nRequestID:7480484b-ea0c-4274-97d7-7f330da9cd24\n"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/mytable947633d6/Tables(\u0027mytable947633d6\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "0",
+        "Date": "Tue, 27 Sep 2022 07:30:28 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:28 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=fullmetadata",
+        "Date": "Tue, 27 Sep 2022 07:30:24 GMT",
+        "Transfer-Encoding": "chunked"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "InvalidInput",
+          "message": {
+            "lang": "en-us",
+            "value": "Request url is invalid.\r\nActivityId: 8480346c-e56a-4580-a84f-e58d0f9111e5, documentdb-dotnet-sdk/2.14.0 Host/64-bit MicrosoftWindowsNT/10.0.19041.0\nRequestID:8480346c-e56a-4580-a84f-e58d0f9111e5\n"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.cosmos.azure.com/Tables(\u0027mytable947633d6\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "0",
+        "Date": "Tue, 27 Sep 2022 07:30:28 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:30:28 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 204,
+      "ResponseHeaders": {
+        "Content-Type": "application/json",
+        "Date": "Tue, 27 Sep 2022 07:30:25 GMT"
+      },
+      "ResponseBody": null
+    }
+  ],
+  "Variables": {}
+}
diff --git a/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties.pyTestTableServicePropertiestest_client_with_url_ends_with_table_name.json b/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties.pyTestTableServicePropertiestest_client_with_url_ends_with_table_name.json
new file mode 100644
index 000000000000..b1b0cd066ec3
--- /dev/null
+++ b/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties.pyTestTableServicePropertiestest_client_with_url_ends_with_table_name.json
@@ -0,0 +1,180 @@
+{
+  "Entries": [
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable3f8138ee/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:13:48 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:13:48 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable3f8138ee"
+      },
+      "StatusCode": 404,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:13:45 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "TableNotFound",
+          "message": {
+            "lang": "en-US",
+            "value": "The table specified does not exist.\nRequestId:bf960be6-c002-000b-408b-bcc6da000000\nTime:2022-08-30T16:13:45.6618362Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable3f8138ee/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:13:48 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:13:48 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable3f8138ee"
+      },
+      "StatusCode": 404,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:13:45 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "TableNotFound",
+          "message": {
+            "lang": "en-US",
+            "value": "The table specified does not exist.\nRequestId:bf960bf4-c002-000b-4b8b-bcc6da000000\nTime:2022-08-30T16:13:45.7038125Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable3f8138ee/?restype=service\u0026comp=properties",
+      "RequestMethod": "PUT",
+      "RequestHeaders": {
+        "Accept": "application/xml",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "251",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 30 Aug 2022 16:13:48 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:13:48 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": [
+        "\u003C?xml version=\u00271.0\u0027 encoding=\u0027utf-8\u0027?\u003E\n",
+        "\u003CStorageServiceProperties\u003E\u003CLogging\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CDelete\u003Efalse\u003C/Delete\u003E\u003CRead\u003Efalse\u003C/Read\u003E\u003CWrite\u003Etrue\u003C/Write\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/Logging\u003E\u003C/StorageServiceProperties\u003E"
+      ],
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Length": "372",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 30 Aug 2022 16:13:45 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "InvalidQueryParameterValue"
+      },
+      "ResponseBody": [
+        "\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003Cm:error xmlns:m=\u0022http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\u0022\u003E\u003Cm:code\u003EInvalidQueryParameterValue\u003C/m:code\u003E\u003Cm:message xml:lang=\u0022en-US\u0022\u003EValue for one of the query parameters specified in the request URI is invalid.\n",
+        "RequestId:bf960bfc-c002-000b-528b-bcc6da000000\n",
+        "Time:2022-08-30T16:13:45.7337944Z\u003C/m:message\u003E\u003C/m:error\u003E"
+      ]
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable3f8138ee/?restype=service\u0026comp=properties",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/xml",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Date": "Tue, 30 Aug 2022 16:13:48 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:13:48 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Length": "372",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 30 Aug 2022 16:13:45 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "InvalidQueryParameterValue"
+      },
+      "ResponseBody": [
+        "\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003Cm:error xmlns:m=\u0022http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\u0022\u003E\u003Cm:code\u003EInvalidQueryParameterValue\u003C/m:code\u003E\u003Cm:message xml:lang=\u0022en-US\u0022\u003EValue for one of the query parameters specified in the request URI is invalid.\n",
+        "RequestId:bf960c02-c002-000b-588b-bcc6da000000\n",
+        "Time:2022-08-30T16:13:45.7637776Z\u003C/m:message\u003E\u003C/m:error\u003E"
+      ]
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable3f8138ee/Tables(\u0027mytable3f8138ee\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "0",
+        "Date": "Tue, 30 Aug 2022 16:13:48 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:13:48 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 404,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:13:45 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "TableNotFound",
+          "message": {
+            "lang": "en-US",
+            "value": "The table specified does not exist.\nRequestId:bf960c0c-c002-000b-618b-bcc6da000000\nTime:2022-08-30T16:13:45.7937611Z"
+          }
+        }
+      }
+    }
+  ],
+  "Variables": {}
+}
diff --git a/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties_async.pyTestTableServicePropertiesAsynctest_client_with_url_ends_with_table_name.json b/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties_async.pyTestTableServicePropertiesAsynctest_client_with_url_ends_with_table_name.json
new file mode 100644
index 000000000000..566d5d0bbecf
--- /dev/null
+++ b/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties_async.pyTestTableServicePropertiesAsynctest_client_with_url_ends_with_table_name.json
@@ -0,0 +1,175 @@
+{
+  "Entries": [
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytabledb403d69/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:14:32 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:14:32 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytabledb403d69"
+      },
+      "StatusCode": 404,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:14:28 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "TableNotFound",
+          "message": {
+            "lang": "en-US",
+            "value": "The table specified does not exist.\nRequestId:695c4e11-a002-0040-5b8b-bc3a89000000\nTime:2022-08-30T16:14:29.6575719Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytabledb403d69/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 30 Aug 2022 16:14:32 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:14:32 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytabledb403d69"
+      },
+      "StatusCode": 404,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:14:29 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "TableNotFound",
+          "message": {
+            "lang": "en-US",
+            "value": "The table specified does not exist.\nRequestId:695c4e1b-a002-0040-638b-bc3a89000000\nTime:2022-08-30T16:14:29.7005472Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytabledb403d69/?restype=service\u0026comp=properties",
+      "RequestMethod": "PUT",
+      "RequestHeaders": {
+        "Accept": "application/xml",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "251",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 30 Aug 2022 16:14:32 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:14:32 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": [
+        "\u003C?xml version=\u00271.0\u0027 encoding=\u0027utf-8\u0027?\u003E\n",
+        "\u003CStorageServiceProperties\u003E\u003CLogging\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CDelete\u003Efalse\u003C/Delete\u003E\u003CRead\u003Efalse\u003C/Read\u003E\u003CWrite\u003Etrue\u003C/Write\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/Logging\u003E\u003C/StorageServiceProperties\u003E"
+      ],
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Length": "372",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 30 Aug 2022 16:14:29 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "InvalidQueryParameterValue"
+      },
+      "ResponseBody": [
+        "\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003Cm:error xmlns:m=\u0022http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\u0022\u003E\u003Cm:code\u003EInvalidQueryParameterValue\u003C/m:code\u003E\u003Cm:message xml:lang=\u0022en-US\u0022\u003EValue for one of the query parameters specified in the request URI is invalid.\n",
+        "RequestId:695c4e1e-a002-0040-658b-bc3a89000000\n",
+        "Time:2022-08-30T16:14:29.7275313Z\u003C/m:message\u003E\u003C/m:error\u003E"
+      ]
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytabledb403d69/?restype=service\u0026comp=properties",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/xml",
+        "Accept-Encoding": "gzip, deflate",
+        "Date": "Tue, 30 Aug 2022 16:14:32 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:14:32 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 400,
+      "ResponseHeaders": {
+        "Content-Length": "372",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 30 Aug 2022 16:14:29 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "InvalidQueryParameterValue"
+      },
+      "ResponseBody": [
+        "\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003Cm:error xmlns:m=\u0022http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\u0022\u003E\u003Cm:code\u003EInvalidQueryParameterValue\u003C/m:code\u003E\u003Cm:message xml:lang=\u0022en-US\u0022\u003EValue for one of the query parameters specified in the request URI is invalid.\n",
+        "RequestId:695c4e21-a002-0040-688b-bc3a89000000\n",
+        "Time:2022-08-30T16:14:29.7605120Z\u003C/m:message\u003E\u003C/m:error\u003E"
+      ]
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytabledb403d69/Tables(\u0027mytabledb403d69\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "0",
+        "Date": "Tue, 30 Aug 2022 16:14:32 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 30 Aug 2022 16:14:32 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 404,
+      "ResponseHeaders": {
+        "Content-Type": "application/json; odata=minimalmetadata; streaming=true; charset=utf-8",
+        "Date": "Tue, 30 Aug 2022 16:14:29 GMT",
+        "Server": [
+          "Windows-Azure-Table/1.0",
+          "Microsoft-HTTPAPI/2.0"
+        ],
+        "Transfer-Encoding": "chunked",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-version": "2019-02-02"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "TableNotFound",
+          "message": {
+            "lang": "en-US",
+            "value": "The table specified does not exist.\nRequestId:695c4e26-a002-0040-6d8b-bc3a89000000\nTime:2022-08-30T16:14:29.7944931Z"
+          }
+        }
+      }
+    }
+  ],
+  "Variables": {}
+}
diff --git a/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties_cosmos.pyTestTableServicePropertiesCosmostest_client_with_url_ends_with_table_name.json b/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties_cosmos.pyTestTableServicePropertiesCosmostest_client_with_url_ends_with_table_name.json
new file mode 100644
index 000000000000..958a89b7bd3c
--- /dev/null
+++ b/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties_cosmos.pyTestTableServicePropertiesCosmostest_client_with_url_ends_with_table_name.json
@@ -0,0 +1,168 @@
+{
+  "Entries": [
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable611a3e55/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:36:18 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:36:18 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable611a3e55"
+      },
+      "StatusCode": 403,
+      "ResponseHeaders": {
+        "Content-Length": "299",
+        "Content-Type": "application/json",
+        "Date": "Tue, 27 Sep 2022 07:36:16 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "AuthenticationFailed"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "AuthenticationFailed",
+          "message": {
+            "lang": "en-US",
+            "value": "Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:075b5c6e-e002-0083-7643-d2aa31000000\nTime:2022-09-27T07:36:16.6789459Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable611a3e55/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:36:19 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:36:19 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable611a3e55"
+      },
+      "StatusCode": 403,
+      "ResponseHeaders": {
+        "Content-Length": "299",
+        "Content-Type": "application/json",
+        "Date": "Tue, 27 Sep 2022 07:36:16 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "AuthenticationFailed"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "AuthenticationFailed",
+          "message": {
+            "lang": "en-US",
+            "value": "Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:075b5c75-e002-0083-7c43-d2aa31000000\nTime:2022-09-27T07:36:16.7259201Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable611a3e55/?restype=service\u0026comp=properties",
+      "RequestMethod": "PUT",
+      "RequestHeaders": {
+        "Accept": "application/xml",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "251",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 27 Sep 2022 07:36:19 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:36:19 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": [
+        "\u003C?xml version=\u00271.0\u0027 encoding=\u0027utf-8\u0027?\u003E\n",
+        "\u003CStorageServiceProperties\u003E\u003CLogging\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CDelete\u003Efalse\u003C/Delete\u003E\u003CRead\u003Efalse\u003C/Read\u003E\u003CWrite\u003Etrue\u003C/Write\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/Logging\u003E\u003C/StorageServiceProperties\u003E"
+      ],
+      "StatusCode": 403,
+      "ResponseHeaders": {
+        "Content-Length": "419",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 27 Sep 2022 07:36:16 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "AuthenticationFailed"
+      },
+      "ResponseBody": [
+        "\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003Cm:error xmlns:m=\u0022http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\u0022\u003E\u003Cm:code\u003EAuthenticationFailed\u003C/m:code\u003E\u003Cm:message xml:lang=\u0022en-US\u0022\u003EServer failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\n",
+        "RequestId:075b5c7e-e002-0083-0443-d2aa31000000\n",
+        "Time:2022-09-27T07:36:16.7569015Z\u003C/m:message\u003E\u003C/m:error\u003E"
+      ]
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable611a3e55/?restype=service\u0026comp=properties",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/xml",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Date": "Tue, 27 Sep 2022 07:36:19 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:36:19 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 403,
+      "ResponseHeaders": {
+        "Content-Length": "419",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 27 Sep 2022 07:36:16 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "AuthenticationFailed"
+      },
+      "ResponseBody": [
+        "\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003Cm:error xmlns:m=\u0022http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\u0022\u003E\u003Cm:code\u003EAuthenticationFailed\u003C/m:code\u003E\u003Cm:message xml:lang=\u0022en-US\u0022\u003EServer failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\n",
+        "RequestId:075b5c7f-e002-0083-0543-d2aa31000000\n",
+        "Time:2022-09-27T07:36:16.7878838Z\u003C/m:message\u003E\u003C/m:error\u003E"
+      ]
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable611a3e55/Tables(\u0027mytable611a3e55\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "0",
+        "Date": "Tue, 27 Sep 2022 07:36:19 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:36:19 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 403,
+      "ResponseHeaders": {
+        "Content-Length": "299",
+        "Content-Type": "application/json",
+        "Date": "Tue, 27 Sep 2022 07:36:16 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "AuthenticationFailed"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "AuthenticationFailed",
+          "message": {
+            "lang": "en-US",
+            "value": "Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:075b5c82-e002-0083-0843-d2aa31000000\nTime:2022-09-27T07:36:16.8198651Z"
+          }
+        }
+      }
+    }
+  ],
+  "Variables": {}
+}
diff --git a/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties_cosmos_async.pyTestTableServicePropertiesCosmosAsynctest_client_with_url_ends_with_table_name.json b/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties_cosmos_async.pyTestTableServicePropertiesCosmosAsynctest_client_with_url_ends_with_table_name.json
new file mode 100644
index 000000000000..19d8af1332c6
--- /dev/null
+++ b/sdk/tables/azure-data-tables/tests/recordings/test_table_service_properties_cosmos_async.pyTestTableServicePropertiesCosmosAsynctest_client_with_url_ends_with_table_name.json
@@ -0,0 +1,163 @@
+{
+  "Entries": [
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable388b42d0/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:39:21 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:39:21 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable388b42d0"
+      },
+      "StatusCode": 403,
+      "ResponseHeaders": {
+        "Content-Length": "299",
+        "Content-Type": "application/json",
+        "Date": "Tue, 27 Sep 2022 07:39:18 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "AuthenticationFailed"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "AuthenticationFailed",
+          "message": {
+            "lang": "en-US",
+            "value": "Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:4cce9c46-e002-0093-1644-d26f59000000\nTime:2022-09-27T07:39:18.7238250Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable388b42d0/Tables",
+      "RequestMethod": "POST",
+      "RequestHeaders": {
+        "Accept": "application/json;odata=minimalmetadata",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "32",
+        "Content-Type": "application/json;odata=nometadata",
+        "DataServiceVersion": "3.0",
+        "Date": "Tue, 27 Sep 2022 07:39:21 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:39:21 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": {
+        "TableName": "mytable388b42d0"
+      },
+      "StatusCode": 403,
+      "ResponseHeaders": {
+        "Content-Length": "299",
+        "Content-Type": "application/json",
+        "Date": "Tue, 27 Sep 2022 07:39:18 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "AuthenticationFailed"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "AuthenticationFailed",
+          "message": {
+            "lang": "en-US",
+            "value": "Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:4cce9c53-e002-0093-2244-d26f59000000\nTime:2022-09-27T07:39:18.7717988Z"
+          }
+        }
+      }
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable388b42d0/?restype=service\u0026comp=properties",
+      "RequestMethod": "PUT",
+      "RequestHeaders": {
+        "Accept": "application/xml",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "251",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 27 Sep 2022 07:39:21 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:39:21 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": [
+        "\u003C?xml version=\u00271.0\u0027 encoding=\u0027utf-8\u0027?\u003E\n",
+        "\u003CStorageServiceProperties\u003E\u003CLogging\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CDelete\u003Efalse\u003C/Delete\u003E\u003CRead\u003Efalse\u003C/Read\u003E\u003CWrite\u003Etrue\u003C/Write\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/Logging\u003E\u003C/StorageServiceProperties\u003E"
+      ],
+      "StatusCode": 403,
+      "ResponseHeaders": {
+        "Content-Length": "419",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 27 Sep 2022 07:39:18 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "AuthenticationFailed"
+      },
+      "ResponseBody": [
+        "\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003Cm:error xmlns:m=\u0022http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\u0022\u003E\u003Cm:code\u003EAuthenticationFailed\u003C/m:code\u003E\u003Cm:message xml:lang=\u0022en-US\u0022\u003EServer failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\n",
+        "RequestId:4cce9c5d-e002-0093-2c44-d26f59000000\n",
+        "Time:2022-09-27T07:39:18.8037815Z\u003C/m:message\u003E\u003C/m:error\u003E"
+      ]
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable388b42d0/?restype=service\u0026comp=properties",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/xml",
+        "Accept-Encoding": "gzip, deflate",
+        "Date": "Tue, 27 Sep 2022 07:39:21 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:39:21 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 403,
+      "ResponseHeaders": {
+        "Content-Length": "419",
+        "Content-Type": "application/xml",
+        "Date": "Tue, 27 Sep 2022 07:39:18 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "AuthenticationFailed"
+      },
+      "ResponseBody": [
+        "\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003Cm:error xmlns:m=\u0022http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\u0022\u003E\u003Cm:code\u003EAuthenticationFailed\u003C/m:code\u003E\u003Cm:message xml:lang=\u0022en-US\u0022\u003EServer failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\n",
+        "RequestId:4cce9c61-e002-0093-3044-d26f59000000\n",
+        "Time:2022-09-27T07:39:18.8427577Z\u003C/m:message\u003E\u003C/m:error\u003E"
+      ]
+    },
+    {
+      "RequestUri": "https://fakeendpoint.table.core.windows.net/mytable388b42d0/Tables(\u0027mytable388b42d0\u0027)",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Accept-Encoding": "gzip, deflate",
+        "Content-Length": "0",
+        "Date": "Tue, 27 Sep 2022 07:39:21 GMT",
+        "User-Agent": "azsdk-python-data-tables/12.5.0 Python/3.9.2 (Windows-10-10.0.22000-SP0)",
+        "x-ms-date": "Tue, 27 Sep 2022 07:39:21 GMT",
+        "x-ms-version": "2019-02-02"
+      },
+      "RequestBody": null,
+      "StatusCode": 403,
+      "ResponseHeaders": {
+        "Content-Length": "299",
+        "Content-Type": "application/json",
+        "Date": "Tue, 27 Sep 2022 07:39:18 GMT",
+        "Server": "Microsoft-HTTPAPI/2.0",
+        "x-ms-error-code": "AuthenticationFailed"
+      },
+      "ResponseBody": {
+        "odata.error": {
+          "code": "AuthenticationFailed",
+          "message": {
+            "lang": "en-US",
+            "value": "Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:4cce9c6e-e002-0093-3d44-d26f59000000\nTime:2022-09-27T07:39:18.8837338Z"
+          }
+        }
+      }
+    }
+  ],
+  "Variables": {}
+}
diff --git a/sdk/tables/azure-data-tables/tests/test_challenge_auth.py b/sdk/tables/azure-data-tables/tests/test_challenge_auth.py
index 20a769342269..4ae7d03e10b2 100644
--- a/sdk/tables/azure-data-tables/tests/test_challenge_auth.py
+++ b/sdk/tables/azure-data-tables/tests/test_challenge_auth.py
@@ -15,7 +15,6 @@
 import pytest
 
 from devtools_testutils import AzureRecordedTestCase, recorded_by_proxy, is_live
-from devtools_testutils.sanitizers import add_general_regex_sanitizer
 from preparers import tables_decorator
 from _shared.testcase import TableTestCase
 
diff --git a/sdk/tables/azure-data-tables/tests/test_table.py b/sdk/tables/azure-data-tables/tests/test_table.py
index 25fb34d0d0e5..88521e90d5dc 100644
--- a/sdk/tables/azure-data-tables/tests/test_table.py
+++ b/sdk/tables/azure-data-tables/tests/test_table.py
@@ -23,10 +23,10 @@
     generate_account_sas,
     ResourceTypes
 )
-from azure.core.credentials import AzureNamedKeyCredential, AzureSasCredential
-from azure.core.exceptions import ResourceExistsError, HttpResponseError
+from azure.core.credentials import AzureSasCredential
+from azure.core.exceptions import ResourceExistsError
 
-from _shared.testcase import TableTestCase, TEST_TABLE_PREFIX
+from _shared.testcase import TableTestCase
 from preparers import tables_decorator, tables_decorator
 
 # ------------------------------------------------------------------------------
@@ -459,9 +459,9 @@ def test_account_sas(self, tables_storage_account_name, tables_primary_storage_a
     
     @tables_decorator
     @recorded_by_proxy
-    def test_unicode_create_table_unicode_name(self, tables_storage_account_name, tables_primary_storage_account_key, **kwargs):
+    def test_unicode_create_table_unicode_name(self, tables_storage_account_name, tables_primary_storage_account_key):
         account_url = self.account_url(tables_storage_account_name, "table")
-        tsc = TableServiceClient(credential=tables_primary_storage_account_key, endpoint=account_url)
+        tsc = TableServiceClient(account_url, credential=tables_primary_storage_account_key)
         invalid_table_name = u'啊齄丂狛狜'
 
         with pytest.raises(ValueError) as excinfo:
@@ -471,9 +471,9 @@ def test_unicode_create_table_unicode_name(self, tables_storage_account_name, ta
     
     @tables_decorator
     @recorded_by_proxy
-    def test_create_table_invalid_name(self, tables_storage_account_name, tables_primary_storage_account_key, **kwargs):
+    def test_create_table_invalid_name(self, tables_storage_account_name, tables_primary_storage_account_key):
         account_url = self.account_url(tables_storage_account_name, "table")
-        tsc = TableServiceClient(credential=tables_primary_storage_account_key, endpoint=account_url)
+        tsc = TableServiceClient(account_url, credential=tables_primary_storage_account_key)
         invalid_table_name = "my_table"
 
         with pytest.raises(ValueError) as excinfo:
diff --git a/sdk/tables/azure-data-tables/tests/test_table_aad.py b/sdk/tables/azure-data-tables/tests/test_table_aad.py
index b56d9fe99d40..c5ee9be69eb5 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_aad.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_aad.py
@@ -7,7 +7,6 @@
 # --------------------------------------------------------------------------
 import pytest
 from datetime import datetime
-import sys
 
 from devtools_testutils import AzureRecordedTestCase, recorded_by_proxy, set_custom_default_matcher
 
diff --git a/sdk/tables/azure-data-tables/tests/test_table_aad_async.py b/sdk/tables/azure-data-tables/tests/test_table_aad_async.py
index 6a77f476abd3..0f8c9588e23a 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_aad_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_aad_async.py
@@ -7,7 +7,6 @@
 # --------------------------------------------------------------------------
 import pytest
 from datetime import datetime
-import sys
 
 from devtools_testutils import AzureRecordedTestCase, set_custom_default_matcher
 from devtools_testutils.aio import recorded_by_proxy_async
diff --git a/sdk/tables/azure-data-tables/tests/test_table_async.py b/sdk/tables/azure-data-tables/tests/test_table_async.py
index 999dd489746b..17a9dac1dfa2 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_async.py
@@ -10,8 +10,8 @@
 from devtools_testutils import AzureRecordedTestCase
 from devtools_testutils.aio import recorded_by_proxy_async
 
-from azure.core.credentials import AzureNamedKeyCredential, AzureSasCredential
-from azure.core.exceptions import ResourceExistsError, HttpResponseError
+from azure.core.credentials import AzureSasCredential
+from azure.core.exceptions import ResourceExistsError
 from azure.data.tables import (
     TableAccessPolicy,
     TableSasPermissions,
@@ -405,7 +405,7 @@ async def test_account_sas(self, tables_storage_account_name, tables_primary_sto
     
     @tables_decorator_async
     @recorded_by_proxy_async
-    async def test_unicode_create_table_unicode_name(self, tables_storage_account_name, tables_primary_storage_account_key, **kwargs):
+    async def test_unicode_create_table_unicode_name(self, tables_storage_account_name, tables_primary_storage_account_key):
         account_url = self.account_url(tables_storage_account_name, "table")
         tsc = TableServiceClient(account_url, credential=tables_primary_storage_account_key)
         invalid_table_name = u'啊齄丂狛狜'
@@ -413,12 +413,12 @@ async def test_unicode_create_table_unicode_name(self, tables_storage_account_na
         with pytest.raises(ValueError) as excinfo:
             async with tsc:
                 await tsc.create_table(invalid_table_name)
-            assert "Storage table names must be alphanumeric, cannot begin with a number, and must be between 3-63 characters long.""" in str(
+            assert "Storage table names must be alphanumeric, cannot begin with a number, and must be between 3-63 characters long." in str(
                 excinfo)
     
     @tables_decorator_async
     @recorded_by_proxy_async
-    async def test_create_table_invalid_name(self, tables_storage_account_name, tables_primary_storage_account_key, **kwargs):
+    async def test_create_table_invalid_name(self, tables_storage_account_name, tables_primary_storage_account_key):
         account_url = self.account_url(tables_storage_account_name, "table")
         tsc = TableServiceClient(account_url, credential=tables_primary_storage_account_key)
         invalid_table_name = "my_table"
@@ -426,5 +426,5 @@ async def test_create_table_invalid_name(self, tables_storage_account_name, tabl
         with pytest.raises(ValueError) as excinfo:
             async with tsc:
                 await tsc.create_table(table_name=invalid_table_name)
-            assert "Storage table names must be alphanumeric, cannot begin with a number, and must be between 3-63 characters long.""" in str(
+            assert "Storage table names must be alphanumeric, cannot begin with a number, and must be between 3-63 characters long." in str(
                 excinfo)
diff --git a/sdk/tables/azure-data-tables/tests/test_table_batch.py b/sdk/tables/azure-data-tables/tests/test_table_batch.py
index 834c0634a564..463febf7ca91 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_batch.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_batch.py
@@ -5,12 +5,9 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-
-import pytest
-
 from datetime import datetime, timedelta
 import os
-import sys
+import pytest
 
 from devtools_testutils import AzureRecordedTestCase, recorded_by_proxy, set_custom_default_matcher
 
@@ -39,9 +36,6 @@
 from _shared.testcase import TableTestCase
 from preparers import tables_decorator
 
-#------------------------------------------------------------------------------
-TEST_TABLE_PREFIX = 'table'
-#------------------------------------------------------------------------------
 
 class TestTableBatch(AzureRecordedTestCase, TableTestCase):
     @tables_decorator
diff --git a/sdk/tables/azure-data-tables/tests/test_table_batch_async.py b/sdk/tables/azure-data-tables/tests/test_table_batch_async.py
index ab5c5b0a9178..25818b17931d 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_batch_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_batch_async.py
@@ -10,7 +10,6 @@
 
 from datetime import datetime, timedelta
 import os
-import sys
 
 from devtools_testutils import AzureRecordedTestCase, set_custom_default_matcher
 from devtools_testutils.aio import recorded_by_proxy_async
diff --git a/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos.py b/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos.py
index 008bb9f40ad6..40a7bfb0c4cc 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos.py
@@ -7,8 +7,6 @@
 # --------------------------------------------------------------------------
 from datetime import datetime, timedelta
 import os
-import sys
-
 import pytest
 
 from devtools_testutils import AzureRecordedTestCase, recorded_by_proxy, set_custom_default_matcher
diff --git a/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos_async.py b/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos_async.py
index a69919cdc74c..d28a58710aac 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos_async.py
@@ -7,7 +7,6 @@
 # --------------------------------------------------------------------------
 from datetime import datetime, timedelta
 import os
-import sys
 import pytest
 
 from devtools_testutils import AzureRecordedTestCase, set_custom_default_matcher
@@ -36,9 +35,6 @@
 from _shared.asynctestcase import AsyncTableTestCase
 from async_preparers import cosmos_decorator_async
 
-#------------------------------------------------------------------------------
-TEST_TABLE_PREFIX = 'table'
-#------------------------------------------------------------------------------
 
 class TestTableBatchCosmosAsync(AzureRecordedTestCase, AsyncTableTestCase):
     @cosmos_decorator_async
diff --git a/sdk/tables/azure-data-tables/tests/test_table_client.py b/sdk/tables/azure-data-tables/tests/test_table_client.py
index 583dacbb6cae..aa2611bbcc1a 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_client.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_client.py
@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from multiprocessing.sharedctypes import Value # cspell:disable-line
 import pytest
 import platform
 
@@ -13,6 +12,7 @@
 from azure.data.tables import TableServiceClient, TableClient
 from azure.data.tables import __version__ as VERSION
 from azure.core.credentials import AzureNamedKeyCredential, AzureSasCredential
+from azure.core.exceptions import ResourceNotFoundError, HttpResponseError
 
 from _shared.testcase import (
     TableTestCase
@@ -20,8 +20,6 @@
 
 from preparers import tables_decorator
 
-# ------------------------------------------------------------------------------
-
 SERVICES = {
     TableServiceClient: 'table',
     TableClient: 'table',
@@ -31,6 +29,7 @@
 
 _CONNECTION_ENDPOINTS_SECONDARY = {'table': 'TableSecondaryEndpoint', 'cosmos': 'TableSecondaryEndpoint'}
 
+
 class TestTableClient(AzureRecordedTestCase, TableTestCase):
     @tables_decorator
     @recorded_by_proxy
@@ -137,6 +136,40 @@ def test_table_name_errors(self, tables_storage_account_name, tables_primary_sto
                 batch.append(('upsert', {'PartitionKey': 'A', 'RowKey': 'B'}))
                 client.submit_transaction(batch)
             assert 'Storage table names must be alphanumeric' in str(error.value)
+    
+    @tables_decorator
+    @recorded_by_proxy
+    def test_client_with_url_ends_with_table_name(self, tables_storage_account_name, tables_primary_storage_account_key):
+        url = self.account_url(tables_storage_account_name, "table")
+        table_name = self.get_resource_name("mytable")
+        invalid_url = url + "/" + table_name
+        # test table client has the same table name as in url
+        tc = TableClient(invalid_url, table_name, credential=tables_primary_storage_account_key)
+        with pytest.raises(ResourceNotFoundError) as exc:
+            tc.create_table()
+        assert ("table specified does not exist") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        # test table client has a different table name as in url
+        table_name2 = self.get_resource_name("mytable2")
+        tc2 = TableClient(invalid_url, table_name2, credential=tables_primary_storage_account_key)
+        with pytest.raises(ResourceNotFoundError) as exc:
+            tc2.create_table()
+        assert ("table specified does not exist") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        valid_tc = TableClient(url, table_name, credential=tables_primary_storage_account_key)
+        valid_tc.create_table()
+        # test creating a table when it already exists
+        with pytest.raises(HttpResponseError) as exc:
+            tc.create_table()
+        assert ("values are not specified") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        # test deleting a table when it already exists
+        with pytest.raises(HttpResponseError) as exc:
+            tc.delete_table()
+        assert ("URI does not match number of key properties for the resource") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        valid_tc.delete_table()
 
 
 class TestTableUnitTests(TableTestCase):
diff --git a/sdk/tables/azure-data-tables/tests/test_table_client_async.py b/sdk/tables/azure-data-tables/tests/test_table_client_async.py
index 21cdc139a685..709425b522bf 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_client_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_client_async.py
@@ -11,6 +11,7 @@
 from devtools_testutils.aio import recorded_by_proxy_async
 
 from azure.core.credentials import AzureNamedKeyCredential, AzureSasCredential
+from azure.core.exceptions import ResourceNotFoundError, HttpResponseError
 from azure.data.tables.aio import TableServiceClient, TableClient
 from azure.data.tables._version import VERSION
 
@@ -135,6 +136,40 @@ async def test_table_name_errors(self, tables_storage_account_name, tables_prima
                     batch.append(('upsert', {'PartitionKey': 'A', 'RowKey': 'B'}))
                     await client.submit_transaction(batch)
                 assert 'Storage table names must be alphanumeric' in str(error.value)
+    
+    @tables_decorator_async
+    @recorded_by_proxy_async
+    async def test_client_with_url_ends_with_table_name(self, tables_storage_account_name, tables_primary_storage_account_key):
+        url = self.account_url(tables_storage_account_name, "table")
+        table_name = self.get_resource_name("mytable")
+        invalid_url = url + "/" + table_name
+        # test table client has the same table name as in url
+        tc = TableClient(invalid_url, table_name, credential=tables_primary_storage_account_key)
+        with pytest.raises(ResourceNotFoundError) as exc:
+            await tc.create_table()
+        assert ("table specified does not exist") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        # test table client has a different table name as in url
+        table_name2 = self.get_resource_name("mytable2")
+        tc2 = TableClient(invalid_url, table_name2, credential=tables_primary_storage_account_key)
+        with pytest.raises(ResourceNotFoundError) as exc:
+            await tc2.create_table()
+        assert ("table specified does not exist") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        valid_tc = TableClient(url, table_name, credential=tables_primary_storage_account_key)
+        await valid_tc.create_table()
+        # test creating a table when it already exists
+        with pytest.raises(HttpResponseError) as exc:
+            await tc.create_table()
+        assert ("values are not specified") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        # test deleting a table when it already exists
+        with pytest.raises(HttpResponseError) as exc:
+            await tc.delete_table()
+        assert ("URI does not match number of key properties for the resource") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        await valid_tc.delete_table()
 
 
 class TestTableClientUnit(AsyncTableTestCase):
diff --git a/sdk/tables/azure-data-tables/tests/test_table_client_cosmos.py b/sdk/tables/azure-data-tables/tests/test_table_client_cosmos.py
index 1f33abc50ada..de860be84215 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_client_cosmos.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_client_cosmos.py
@@ -15,13 +15,9 @@
 from azure.core.credentials import AzureNamedKeyCredential, AzureSasCredential
 from azure.core.exceptions import HttpResponseError, ResourceNotFoundError
 
-from _shared.testcase import (
-    TableTestCase,
-    SLEEP_DELAY
-)
+from _shared.testcase import TableTestCase
 from preparers import cosmos_decorator
 
-# ------------------------------------------------------------------------------
 SERVICES = {
     TableServiceClient: 'cosmos',
     TableClient: 'cosmos',
@@ -31,6 +27,7 @@
 
 _CONNECTION_ENDPOINTS_SECONDARY = {'table': 'TableSecondaryEndpoint', 'cosmos': 'TableSecondaryEndpoint'}
 
+
 class TestTableClientCosmos(AzureRecordedTestCase, TableTestCase):
     @pytest.mark.skipif(sys.version_info < (3, 0), reason="Malformed string")
     @cosmos_decorator
diff --git a/sdk/tables/azure-data-tables/tests/test_table_client_cosmos_async.py b/sdk/tables/azure-data-tables/tests/test_table_client_cosmos_async.py
index 8d5fda57548d..a103c2fdd07b 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_client_cosmos_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_client_cosmos_async.py
@@ -15,11 +15,8 @@
 from azure.data.tables import __version__ as VERSION, TableTransactionError
 
 from _shared.asynctestcase import AsyncTableTestCase
-from _shared.testcase import SLEEP_DELAY
 from async_preparers import cosmos_decorator_async
 
-# ------------------------------------------------------------------------------
-
 SERVICES = {
     TableServiceClient: 'cosmos',
     TableClient: 'cosmos',
@@ -29,6 +26,7 @@
 
 _CONNECTION_ENDPOINTS_SECONDARY = {'table': 'TableSecondaryEndpoint', 'cosmos': 'TableSecondaryEndpoint'}
 
+
 class TestTableClientCosmosAsync(AzureRecordedTestCase, AsyncTableTestCase):
 
     @cosmos_decorator_async
diff --git a/sdk/tables/azure-data-tables/tests/test_table_cosmos.py b/sdk/tables/azure-data-tables/tests/test_table_cosmos.py
index 4cf04a69f1e7..923f1b4f468c 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_cosmos.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_cosmos.py
@@ -8,16 +8,12 @@
 
 from devtools_testutils import AzureRecordedTestCase, recorded_by_proxy
 
-from azure.core.credentials import AzureNamedKeyCredential
-from azure.core.exceptions import ResourceExistsError
-from azure.data.tables import TableServiceClient
+from azure.core.exceptions import ResourceExistsError, HttpResponseError
+from azure.data.tables import TableServiceClient, TableClient
 
-from _shared.testcase import TableTestCase, SLEEP_DELAY
+from _shared.testcase import TableTestCase
 from preparers import cosmos_decorator
 
-# ------------------------------------------------------------------------------
-TEST_TABLE_PREFIX = 'pytablesync'
-# ------------------------------------------------------------------------------
 
 class TestTableCosmos(AzureRecordedTestCase, TableTestCase):
     @cosmos_decorator
@@ -215,3 +211,37 @@ def test_create_table_unicode_name(self, tables_cosmos_account_name, tables_prim
         assert client.table_name == table_name
         
         ts.delete_table(table_name)
+    
+    @cosmos_decorator
+    @recorded_by_proxy
+    def test_client_with_url_ends_with_table_name(self, tables_cosmos_account_name, tables_primary_cosmos_account_key):
+        url = self.account_url(tables_cosmos_account_name, "cosmos")
+        table_name = self.get_resource_name("mytable")
+        invalid_url = url + "/" + table_name
+        # test table client has the same table name as in url
+        tc = TableClient(invalid_url, table_name, credential=tables_primary_cosmos_account_key)
+        with pytest.raises(HttpResponseError) as exc:
+            tc.create_table()
+        assert ("Request url is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        # test table client has a different table name as in url
+        table_name2 = self.get_resource_name("mytable2")
+        tc2 = TableClient(invalid_url, table_name2, credential=tables_primary_cosmos_account_key)
+        with pytest.raises(HttpResponseError) as exc:
+            tc2.create_table()
+        assert ("Request url is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        valid_tc = TableClient(url, table_name, credential=tables_primary_cosmos_account_key)
+        valid_tc.create_table()
+        # test creating a table when it already exists
+        with pytest.raises(HttpResponseError) as exc:
+            tc.create_table()
+        assert ("Request url is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        # test deleting a table when it already exists
+        with pytest.raises(HttpResponseError) as exc:
+            tc.delete_table()
+        assert ("Request url is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        valid_tc.delete_table()
diff --git a/sdk/tables/azure-data-tables/tests/test_table_cosmos_async.py b/sdk/tables/azure-data-tables/tests/test_table_cosmos_async.py
index f2c5632f5188..f95b48c80531 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_cosmos_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_cosmos_async.py
@@ -8,17 +8,12 @@
 from devtools_testutils import AzureRecordedTestCase
 from devtools_testutils.aio import recorded_by_proxy_async
 
-from azure.core.credentials import AzureNamedKeyCredential
-from azure.core.exceptions import ResourceExistsError
-from azure.data.tables.aio import TableServiceClient
+from azure.core.exceptions import ResourceExistsError, HttpResponseError
+from azure.data.tables.aio import TableServiceClient, TableClient
 
 from _shared.asynctestcase import AsyncTableTestCase
-from _shared.testcase import SLEEP_DELAY
 from async_preparers import cosmos_decorator_async
 
-TEST_TABLE_PREFIX = 'pytableasync'
-
-# ------------------------------------------------------------------------------
 
 class TestTableCosmosAsync(AzureRecordedTestCase, AsyncTableTestCase):
     @cosmos_decorator_async
@@ -222,3 +217,37 @@ async def test_create_table_unicode_name(self, tables_cosmos_account_name, table
         assert client.table_name == table_name
         
         await ts.delete_table(table_name)
+
+    @cosmos_decorator_async
+    @recorded_by_proxy_async
+    async def test_client_with_url_ends_with_table_name(self, tables_cosmos_account_name, tables_primary_cosmos_account_key):
+        url = self.account_url(tables_cosmos_account_name, "cosmos")
+        table_name = self.get_resource_name("mytable")
+        invalid_url = url + "/" + table_name
+        # test table client has the same table name as in url
+        tc = TableClient(invalid_url, table_name, credential=tables_primary_cosmos_account_key)
+        with pytest.raises(HttpResponseError) as exc:
+            await tc.create_table()
+        assert ("Request url is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        # test table client has a different table name as in url
+        table_name2 = self.get_resource_name("mytable2")
+        tc2 = TableClient(invalid_url, table_name2, credential=tables_primary_cosmos_account_key)
+        with pytest.raises(HttpResponseError) as exc:
+            await tc2.create_table()
+        assert ("Request url is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        valid_tc = TableClient(url, table_name, credential=tables_primary_cosmos_account_key)
+        await valid_tc.create_table()
+        # test creating a table when it already exists
+        with pytest.raises(HttpResponseError) as exc:
+            await tc.create_table()
+        assert ("Request url is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        # test deleting a table when it already exists
+        with pytest.raises(HttpResponseError) as exc:
+            await tc.delete_table()
+        assert ("Request url is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+        await valid_tc.delete_table()
diff --git a/sdk/tables/azure-data-tables/tests/test_table_entity.py b/sdk/tables/azure-data-tables/tests/test_table_entity.py
index 1f1ee77b3044..2510f9f8c473 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_entity.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_entity.py
@@ -13,7 +13,7 @@
 from math import isnan
 from uuid import UUID
 
-from devtools_testutils import AzureRecordedTestCase, recorded_by_proxy, set_bodiless_matcher
+from devtools_testutils import AzureRecordedTestCase, recorded_by_proxy
 
 from azure.data.tables import (
     TableServiceClient,
diff --git a/sdk/tables/azure-data-tables/tests/test_table_service_properties.py b/sdk/tables/azure-data-tables/tests/test_table_service_properties.py
index 96bd470b272c..70640a2e1b11 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_service_properties.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_service_properties.py
@@ -17,7 +17,7 @@
     TableRetentionPolicy,
     TableCorsRule
 )
-from azure.core.exceptions import HttpResponseError
+from azure.core.exceptions import ResourceNotFoundError, HttpResponseError
 
 from _shared.testcase import TableTestCase
 from preparers import tables_decorator
@@ -138,8 +138,7 @@ def test_too_many_cors_rules(self, tables_storage_account_name, tables_primary_s
             cors.append(TableCorsRule(['www.xyz.com'], ['GET']))
 
         # Assert
-        pytest.raises(HttpResponseError,
-                          tsc.set_service_properties, cors=cors)
+        pytest.raises(HttpResponseError, tsc.set_service_properties, cors=cors)
 
     @tables_decorator
     @recorded_by_proxy
@@ -150,9 +149,37 @@ def test_retention_too_long(self, tables_storage_account_name, tables_primary_st
                                  retention_policy=TableRetentionPolicy(enabled=True, days=366))
 
         # Assert
-        pytest.raises(HttpResponseError,
-                          tsc.set_service_properties,
-                          minute_metrics=minute_metrics)
+        pytest.raises(HttpResponseError, tsc.set_service_properties, minute_metrics=minute_metrics)
+
+    @tables_decorator
+    @recorded_by_proxy
+    def test_client_with_url_ends_with_table_name(self, tables_storage_account_name, tables_primary_storage_account_key):
+        url = self.account_url(tables_storage_account_name, "table")
+        table_name = self.get_resource_name("mytable")
+        invalid_url = url + "/" + table_name
+        tsc = TableServiceClient(invalid_url, credential=tables_primary_storage_account_key)
+
+        with pytest.raises(ResourceNotFoundError) as exc:
+            tsc.create_table(table_name)
+        assert ("table specified does not exist") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(ResourceNotFoundError) as exc:
+            tsc.create_table_if_not_exists(table_name)
+        assert ("table specified does not exist") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            tsc.set_service_properties(analytics_logging=TableAnalyticsLogging(write=True))
+        assert ("URI is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            tsc.get_service_properties()
+        assert ("URI is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        tsc.delete_table(table_name)
 
 
 class TestTableUnitTest(TableTestCase):
diff --git a/sdk/tables/azure-data-tables/tests/test_table_service_properties_async.py b/sdk/tables/azure-data-tables/tests/test_table_service_properties_async.py
index 38ddfe8b5713..1c82c64d48d6 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_service_properties_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_service_properties_async.py
@@ -11,7 +11,7 @@
 from devtools_testutils import AzureRecordedTestCase
 from devtools_testutils.aio import recorded_by_proxy_async
 
-from azure.core.exceptions import HttpResponseError
+from azure.core.exceptions import ResourceNotFoundError, HttpResponseError
 
 from azure.data.tables import TableAnalyticsLogging, TableMetrics, TableRetentionPolicy, TableCorsRule
 from azure.data.tables.aio import TableServiceClient
@@ -149,6 +149,36 @@ async def test_retention_too_long_async(self, tables_storage_account_name, table
         # Assert
         with pytest.raises(HttpResponseError):
             await tsc.set_service_properties(minute_metrics=minute_metrics)
+    
+    @tables_decorator_async
+    @recorded_by_proxy_async
+    async def test_client_with_url_ends_with_table_name(self, tables_storage_account_name, tables_primary_storage_account_key):
+        url = self.account_url(tables_storage_account_name, "table")
+        table_name = self.get_resource_name("mytable")
+        invalid_url = url + "/" + table_name
+        tsc = TableServiceClient(invalid_url, credential=tables_primary_storage_account_key)
+
+        with pytest.raises(ResourceNotFoundError) as exc:
+            await tsc.create_table(table_name)
+        assert ("table specified does not exist") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(ResourceNotFoundError) as exc:
+            await tsc.create_table_if_not_exists(table_name)
+        assert ("table specified does not exist") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            await tsc.set_service_properties(analytics_logging=TableAnalyticsLogging(write=True))
+        assert ("URI is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            await tsc.get_service_properties()
+        assert ("URI is invalid") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        await tsc.delete_table(table_name)
 
 
 class TestTableUnitTest(TableTestCase):
diff --git a/sdk/tables/azure-data-tables/tests/test_table_service_properties_cosmos.py b/sdk/tables/azure-data-tables/tests/test_table_service_properties_cosmos.py
index f6befc3b864b..443a6bafd619 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_service_properties_cosmos.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_service_properties_cosmos.py
@@ -12,13 +12,14 @@
 from azure.core.exceptions import HttpResponseError
 
 from azure.data.tables import (
+    TableAnalyticsLogging,
     TableServiceClient,
     TableMetrics,
     TableRetentionPolicy,
     TableCorsRule
 )
 
-from _shared.testcase import TableTestCase, SLEEP_DELAY
+from _shared.testcase import TableTestCase
 from preparers import cosmos_decorator
 # ------------------------------------------------------------------------------
 
@@ -43,6 +44,39 @@ def test_retention_too_long(self, tables_cosmos_account_name, tables_primary_cos
         with pytest.raises(HttpResponseError):
             tsc.set_service_properties(minute_metrics=minute_metrics)
 
+    @cosmos_decorator
+    @recorded_by_proxy
+    def test_client_with_url_ends_with_table_name(self, tables_cosmos_account_name, tables_primary_cosmos_account_key):
+        url = self.account_url(tables_cosmos_account_name, "table")
+        table_name = self.get_resource_name("mytable")
+        invalid_url = url + "/" + table_name
+        tsc = TableServiceClient(invalid_url, credential=tables_primary_cosmos_account_key)
+
+        with pytest.raises(HttpResponseError) as exc:
+            tsc.create_table(table_name)
+        assert ("Server failed to authenticate the request") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            tsc.create_table_if_not_exists(table_name)
+        assert ("Server failed to authenticate the request") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            tsc.set_service_properties(analytics_logging=TableAnalyticsLogging(write=True))
+        assert ("Server failed to authenticate the request") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            tsc.get_service_properties()
+        assert ("Server failed to authenticate the request") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            tsc.delete_table(table_name)
+        assert ("Server failed to authenticate the request") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
 
 class TestTableUnitTest(TableTestCase):
 
diff --git a/sdk/tables/azure-data-tables/tests/test_table_service_properties_cosmos_async.py b/sdk/tables/azure-data-tables/tests/test_table_service_properties_cosmos_async.py
index 7361e89940e8..6e8bdb5ecfb2 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_service_properties_cosmos_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_service_properties_cosmos_async.py
@@ -14,7 +14,6 @@
 from azure.data.tables.aio import TableServiceClient
 from azure.core.exceptions import HttpResponseError
 
-from _shared.testcase import SLEEP_DELAY
 from _shared.asynctestcase import AsyncTableTestCase
 from async_preparers import cosmos_decorator_async
 # ------------------------------------------------------------------------------
@@ -45,6 +44,39 @@ async def test_retention_too_long_async(self, tables_cosmos_account_name, tables
         with pytest.raises(HttpResponseError):
             await tsc.set_service_properties(minute_metrics=minute_metrics)
 
+    @cosmos_decorator_async
+    @recorded_by_proxy_async
+    async def test_client_with_url_ends_with_table_name(self, tables_cosmos_account_name, tables_primary_cosmos_account_key):
+        url = self.account_url(tables_cosmos_account_name, "table")
+        table_name = self.get_resource_name("mytable")
+        invalid_url = url + "/" + table_name
+        tsc = TableServiceClient(invalid_url, credential=tables_primary_cosmos_account_key)
+
+        with pytest.raises(HttpResponseError) as exc:
+            await tsc.create_table(table_name)
+        assert ("Server failed to authenticate the request") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            await tsc.create_table_if_not_exists(table_name)
+        assert ("Server failed to authenticate the request") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            await tsc.set_service_properties(analytics_logging=TableAnalyticsLogging(write=True))
+        assert ("Server failed to authenticate the request") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            await tsc.get_service_properties()
+        assert ("Server failed to authenticate the request") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
+        with pytest.raises(HttpResponseError) as exc:
+            await tsc.delete_table(table_name)
+        assert ("Server failed to authenticate the request") in str(exc.value)
+        assert ("Please check your account URL.") in str(exc.value)
+
 
 class TestTableUnitTest(AsyncTableTestCase):
 
diff --git a/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos.py b/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos.py
index efd5982a372f..058bd5ce8df4 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos.py
@@ -8,7 +8,7 @@
 from devtools_testutils import AzureRecordedTestCase, recorded_by_proxy
 
 from azure.data.tables import TableServiceClient
-from _shared.testcase import TableTestCase, SLEEP_DELAY
+from _shared.testcase import TableTestCase
 from preparers import cosmos_decorator
 
 SERVICE_UNAVAILABLE_RESP_BODY = '<?xml version="1.0" encoding="utf-8"?><StorageServiceStats><GeoReplication><Status' \
diff --git a/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos_async.py b/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos_async.py
index c136ff0a1744..5f65bb52d1dd 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos_async.py
@@ -11,7 +11,6 @@
 from azure.data.tables.aio import TableServiceClient
 
 from _shared.asynctestcase import AsyncTableTestCase
-from _shared.testcase import SLEEP_DELAY
 from async_preparers import cosmos_decorator_async
 
 SERVICE_UNAVAILABLE_RESP_BODY = '<?xml version="1.0" encoding="utf-8"?><StorageServiceStats><GeoReplication><Status' \