diff --git a/sdk/eventhub/Microsoft.Azure.EventHubs/tests/Infrastructure/TestConstants.cs b/sdk/eventhub/Microsoft.Azure.EventHubs/tests/Infrastructure/TestConstants.cs
index 0c82a83ad3cc..9f9a6e4609f6 100644
--- a/sdk/eventhub/Microsoft.Azure.EventHubs/tests/Infrastructure/TestConstants.cs
+++ b/sdk/eventhub/Microsoft.Azure.EventHubs/tests/Infrastructure/TestConstants.cs
@@ -16,11 +16,11 @@ internal static class TestConstants
         internal const string AuthorityHostEnvironmentVariableName = "AZURE_AUTHORITY_HOST";
         internal const string ServiceManagementUrlEnvironmentVariableName = "SERVICE_MANAGEMENT_URL";
         internal const string ResourceManagerEnvironmentVariableName = "RESOURCE_MANAGER_URL";
-        internal const string StorageEndpointSuffixEnvironmentVariableName = "STORAGE_ENDPOINT_SUFFIX";
+        internal const string StorageEndpointSuffixEnvironmentVariableName = "EVENTHUB_STORAGE_ENDPOINT_SUFFIX";
         internal const string EventHubsNamespaceConnectionStringEnvironmentVariable = "EVENTHUB_NAMESPACE_CONNECTION_STRING";
         internal const string StorageConnectionStringEnvironmentVariable = "EVENTHUB_PROCESSOR_STORAGE_CONNECTION_STRING";
 
         // General
         internal static readonly TimeSpan DefaultOperationTimeout = TimeSpan.FromSeconds(180);
     }
-}
\ No newline at end of file
+}
diff --git a/sdk/eventhub/test-resources.json b/sdk/eventhub/test-resources.json
index 1f356458800f..1073e78ab0b0 100755
--- a/sdk/eventhub/test-resources.json
+++ b/sdk/eventhub/test-resources.json
@@ -176,6 +176,10 @@
     }
   ],
   "outputs": {
+    "EVENTHUB_STORAGE_ENDPOINT_SUFFIX": {
+        "type": "string",
+        "value": "[parameters('storageEndpointSuffix')]"
+    },
     "EVENTHUB_PER_TEST_LIMIT_MINUTES": {
       "type": "string",
       "value": "[parameters('perTestExecutionLimitMinutes')]"
@@ -189,4 +193,4 @@
       "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageAccount'), ';AccountKey=', listKeys(variables('storageAccountId'), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value, ';EndpointSuffix=', parameters('storageEndpointSuffix'))]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/sdk/search/test-resources.json b/sdk/search/test-resources.json
index 6fe8c50a5e70..9fc89b3ed2b2 100644
--- a/sdk/search/test-resources.json
+++ b/sdk/search/test-resources.json
@@ -41,6 +41,20 @@
                 "description": "The location of the resource. By default, this is the same as the resource group."
             }
         },
+        "searchEndpointSuffix": {
+          "type": "string",
+          "defaultValue": "search.windows.net",
+          "metadata": {
+              "description": "The url suffix to use when accessing the search data plane."
+          }
+        },
+        "storageEndpointSuffix": {
+          "type": "string",
+          "defaultValue": "core.windows.net",
+          "metadata": {
+              "description": "The url suffix to use when accessing the storage data plane."
+          }
+        },
         "searchSku": {
             "type": "string",
             "defaultValue": "basic",
@@ -158,6 +172,14 @@
         }
     ],
     "outputs": {
+        "STORAGE_ENDPOINT_SUFFIX": {
+            "type": "string",
+            "value": "[parameters('storageEndpointSuffix')]"
+        },
+        "SEARCH_ENDPOINT_SUFFIX": {
+            "type": "string",
+            "value": "[parameters('searchEndpointSuffix')]"
+        },
         "SEARCH_SERVICE_NAME": {
             "type": "string",
             "value": "[variables('searchServiceName')]"
@@ -188,4 +210,4 @@
             "value": "[reference(variables('keyVaultName')).vaultUri]"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sdk/tables/test-resources.json b/sdk/tables/test-resources.json
index c94da925c3f3..7d77065dbf79 100644
--- a/sdk/tables/test-resources.json
+++ b/sdk/tables/test-resources.json
@@ -10,6 +10,20 @@
             "metadata": {
                 "description": "The principal to assign the role to. This is application object id."
             }
+        },
+        "cosmosEndpointSuffix": {
+          "type": "string",
+          "defaultValue": "cosmos.azure.com",
+          "metadata": {
+              "description": "The url suffix to use when accessing the cosmos data plane."
+          }
+        },
+        "storageEndpointSuffix": {
+          "type": "string",
+          "defaultValue": "core.windows.net",
+          "metadata": {
+              "description": "The url suffix to use when accessing the storage data plane."
+          }
         }
     },
     "variables": {
@@ -107,6 +121,14 @@
         }
     ],
     "outputs": {
+        "COSMOS_TABLES_ENDPOINT_SUFFIX": {
+            "type": "string",
+            "value": "[parameters('cosmosEndpointSuffix')]"
+        },
+        "STORAGE_ENDPOINT_SUFFIX": {
+            "type": "string",
+            "value": "[parameters('storageEndpointSuffix')]"
+        },
         "TABLES_STORAGE_ACCOUNT_NAME": {
             "type": "string",
             "value": "[variables('primaryAccountName')]"