diff --git a/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts b/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts
index 27789ab65c68..e5b7b3f8db49 100644
--- a/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts
+++ b/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts
@@ -3,11 +3,7 @@ import * as assert from "assert";
 import * as dotenv from "dotenv";
 
 import { DataLakeServiceClient, ServiceListFileSystemsSegmentResponse } from "../src";
-import {
-  getDataLakeServiceClient,
-  getDataLakeServiceClientWithDefaultCredential,
-  recorderEnvSetup
-} from "./utils";
+import { getDataLakeServiceClient, getTokenDataLakeServiceClient, recorderEnvSetup } from "./utils";
 
 dotenv.config();
 
@@ -324,11 +320,11 @@ describe("DataLakeServiceClient", () => {
   // });
 
   it("getUserDelegationKey should work", async function() {
-    // Try to get serviceURL object with DefaultCredential
-    // when AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_CLIENT_SECRET environment variable is set
+    // Try to get serviceURL object with TokenCredential
+    // when DFS_ACCOUNT_TOKEN environment variable is set
     let serviceURLWithToken: DataLakeServiceClient | undefined;
     try {
-      serviceURLWithToken = getDataLakeServiceClientWithDefaultCredential();
+      serviceURLWithToken = getTokenDataLakeServiceClient();
     } catch {}
 
     // Requires bearer token for this case which cannot be generated in the runtime
diff --git a/sdk/storage/storage-queue/tests.yml b/sdk/storage/storage-queue/tests.yml
index 8fd7a8bc31f4..c32dceb5f56d 100644
--- a/sdk/storage/storage-queue/tests.yml
+++ b/sdk/storage/storage-queue/tests.yml
@@ -5,3 +5,5 @@ extends:
   parameters:
     PackageName: "@azure/storage-queue"
     ResourceServiceDirectory: storage
+    ResourceGroupLocation: canadacentral
+    SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)