diff --git a/sdk/eventhub/event-hubs/test/client.spec.ts b/sdk/eventhub/event-hubs/test/client.spec.ts
index 6c6f0c47e2c0..6bb692350019 100644
--- a/sdk/eventhub/event-hubs/test/client.spec.ts
+++ b/sdk/eventhub/event-hubs/test/client.spec.ts
@@ -82,12 +82,15 @@ describe("Create EventHubClient #RunnableInBrowser", function(): void {
       "define AZURE_CLIENT_SECRET in your environment before running integration tests."
     );
     should.exist(
-      env[EnvVarKeys.ENDPOINT],
-      "define ENDPOINT in your environment before running integration tests."
+      env[EnvVarKeys.EVENTHUB_CONNECTION_STRING],
+      "define EVENTHUB_CONNECTION_STRING in your environment before running integration tests."
     );
 
+    // This is of the form <your-namespace>.servicebus.windows.net
+    const endpoint = (env.EVENTHUB_CONNECTION_STRING.match("Endpoint=sb://(.*)/;") || "")[1];
+
     const credential = new EnvironmentCredential();
-    const client = new EventHubClient(env.ENDPOINT, env.EVENTHUB_NAME, credential);
+    const client = new EventHubClient(endpoint, env.EVENTHUB_NAME, credential);
 
     // Extra check involving actual call to the service to ensure this works
     const hubInfo = await client.getProperties();
diff --git a/sdk/eventhub/event-hubs/test/utils/testUtils.ts b/sdk/eventhub/event-hubs/test/utils/testUtils.ts
index 466ff904515a..522626075ae7 100644
--- a/sdk/eventhub/event-hubs/test/utils/testUtils.ts
+++ b/sdk/eventhub/event-hubs/test/utils/testUtils.ts
@@ -11,7 +11,6 @@ export enum EnvVarKeys {
   EVENTHUB_CONNECTION_STRING = "EVENTHUB_CONNECTION_STRING",
   EVENTHUB_NAME = "EVENTHUB_NAME",
   IOTHUB_CONNECTION_STRING = "IOTHUB_CONNECTION_STRING",
-  ENDPOINT = "ENDPOINT",
   AZURE_TENANT_ID = "AZURE_TENANT_ID",
   AZURE_CLIENT_ID = "AZURE_CLIENT_ID",
   AZURE_CLIENT_SECRET = "AZURE_CLIENT_SECRET"
@@ -31,7 +30,6 @@ export function getEnvVars(): { [key in EnvVarKeys]: any } {
     [EnvVarKeys.EVENTHUB_CONNECTION_STRING]: getEnvVarValue(EnvVarKeys.EVENTHUB_CONNECTION_STRING),
     [EnvVarKeys.EVENTHUB_NAME]: getEnvVarValue(EnvVarKeys.EVENTHUB_NAME),
     [EnvVarKeys.IOTHUB_CONNECTION_STRING]: getEnvVarValue(EnvVarKeys.IOTHUB_CONNECTION_STRING),
-    [EnvVarKeys.ENDPOINT]: getEnvVarValue(EnvVarKeys.ENDPOINT),
     [EnvVarKeys.AZURE_TENANT_ID]: getEnvVarValue(EnvVarKeys.AZURE_TENANT_ID),
     [EnvVarKeys.AZURE_CLIENT_ID]: getEnvVarValue(EnvVarKeys.AZURE_CLIENT_ID),
     [EnvVarKeys.AZURE_CLIENT_SECRET]: getEnvVarValue(EnvVarKeys.AZURE_CLIENT_SECRET)
diff --git a/sdk/eventhub/event-hubs/tests.yml b/sdk/eventhub/event-hubs/tests.yml
index 0823168fc436..592426c33f29 100644
--- a/sdk/eventhub/event-hubs/tests.yml
+++ b/sdk/eventhub/event-hubs/tests.yml
@@ -58,4 +58,3 @@ jobs:
         AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
         IOTHUB_CONNECTION_STRING: $(js-event-hubs-test-iothub-connection-string)
         EVENTHUB_CONNECTION_STRING: $(js-event-hubs-test-connection-string)
-        ENDPOINT: $(js-event-hubs-test-endpoint)