diff --git a/test/fx.ts b/test/fx.ts
index 393eb59d7..07d0249e4 100644
--- a/test/fx.ts
+++ b/test/fx.ts
@@ -460,14 +460,14 @@ export class DataExplorer {
     const containerNode = await this.waitForContainerNode(context.database.id, context.container.id);
     await containerNode.expand();
 
-    // refresh tree to remove deleted database
-    const consoleMessages = await this.getNotificationConsoleMessages();
-    const refreshButton = this.frame.getByTestId("Sidebar/RefreshButton");
-    await refreshButton.click();
-    await expect(consoleMessages).toContainText("Successfully refreshed databases", {
-      timeout: ONE_MINUTE_MS,
-    });
-    await this.collapseNotificationConsole();
+    // // refresh tree to remove deleted database
+    // const consoleMessages = await this.getNotificationConsoleMessages();
+    // const refreshButton = this.frame.getByTestId("Sidebar/RefreshButton");
+    // await refreshButton.click();
+    // await expect(consoleMessages).toContainText("Successfully refreshed databases", {
+    //   timeout: ONE_MINUTE_MS,
+    // });
+    // await this.collapseNotificationConsole();
 
     const scaleAndSettingsButton = this.frame.getByTestId(
       `TreeNode:${context.database.id}/${context.container.id}/Scale & Settings`,
diff --git a/test/sql/scaleAndSettings/changePartitionKey.spec.ts b/test/sql/scaleAndSettings/changePartitionKey.spec.ts
index 9385299a0..b4ec5ff49 100644
--- a/test/sql/scaleAndSettings/changePartitionKey.spec.ts
+++ b/test/sql/scaleAndSettings/changePartitionKey.spec.ts
@@ -23,9 +23,11 @@ test.describe("Change Partition Key", () => {
     await PartitionKeyTab.click();
   });
 
-  // test.afterAll("Delete Test Database", async () => {
-  //   await context?.dispose();
-  // });
+  if (!process.env.CI) {
+    test.afterEach("Delete Test Database", async () => {
+      await context?.dispose();
+    });
+  }
 
   test("Change partition key path", async () => {
     await expect(explorer.frame.getByText("/partitionKey")).toBeVisible();
diff --git a/test/sql/scaleAndSettings/scale.spec.ts b/test/sql/scaleAndSettings/scale.spec.ts
index 4d2bc98a2..01809d107 100644
--- a/test/sql/scaleAndSettings/scale.spec.ts
+++ b/test/sql/scaleAndSettings/scale.spec.ts
@@ -13,11 +13,10 @@ test.describe("Autoscale and Manual throughput", () => {
   let context: TestContainerContext = null!;
   let explorer: DataExplorer = null!;
 
-  test.beforeAll("Create Test Database", async () => {
-    context = await createTestSQLContainer();
-  });
+  test.beforeAll("Create Test Database", async () => {});
 
   test.beforeEach("Open container settings", async ({ page }) => {
+    context = await createTestSQLContainer();
     explorer = await DataExplorer.open(page, TestAccount.SQL);
 
     // Click Scale & Settings and open Scale tab
@@ -26,9 +25,11 @@ test.describe("Autoscale and Manual throughput", () => {
     await scaleTab.click();
   });
 
-  // test.afterEach("Delete Test Database", async () => {
-  //   await context?.dispose();
-  // });
+  if (!process.env.CI) {
+    test.afterEach("Delete Test Database", async () => {
+      await context?.dispose();
+    });
+  }
 
   test("Update autoscale max throughput", async () => {
     // By default the created container has manual throughput (Containers created via JS SDK v4.7.0 cannot be created with autoscale throughput)
diff --git a/test/sql/scaleAndSettings/settings.spec.ts b/test/sql/scaleAndSettings/settings.spec.ts
index 7a4f72dd5..ffa7b5a19 100644
--- a/test/sql/scaleAndSettings/settings.spec.ts
+++ b/test/sql/scaleAndSettings/settings.spec.ts
@@ -6,11 +6,11 @@ test.describe("Settings under Scale & Settings", () => {
   let context: TestContainerContext = null!;
   let explorer: DataExplorer = null!;
 
-  test.beforeAll("Create Test Database", async () => {
-    context = await createTestSQLContainer();
-  });
+  // test.beforeAll("Create Test Database", async () => {
+  // });
 
   test.beforeEach("Open container settings", async ({ page }) => {
+    context = await createTestSQLContainer();
     explorer = await DataExplorer.open(page, TestAccount.SQL);
 
     // Click Scale & Settings and open Scale tab
@@ -22,6 +22,11 @@ test.describe("Settings under Scale & Settings", () => {
   // test.afterEach("Delete Test Database", async () => {
   //   await context?.dispose();
   // });
+  if (!process.env.CI) {
+    test.afterEach("Delete Test Database", async () => {
+      await context?.dispose();
+    });
+  }
 
   test("Update TTL to On (no default)", async () => {
     const ttlOnNoDefaultRadioButton = explorer.frame.getByRole("radio", { name: "ttl-on-no-default-option" });