diff --git a/test/fx.ts b/test/fx.ts
index 7d171bc67..9c8c382a3 100644
--- a/test/fx.ts
+++ b/test/fx.ts
@@ -250,8 +250,7 @@ class TreeNode {
       // Try three times to wait for the node to expand.
       for (let i = 0; i < RETRY_COUNT; i++) {
         try {
-          // Use a longer timeout (30s) since expanding may require loading children from the server
-          await tree.waitFor({ state: "visible", timeout: 30 * 1000 });
+          await tree.waitFor({ state: "visible" });
           // The tree has expanded, let's get out of here
           return true;
         } catch {
diff --git a/test/sql/scaleAndSettings/sharedThroughput.spec.ts b/test/sql/scaleAndSettings/sharedThroughput.spec.ts
index 61e4c501e..d1c7d4c90 100644
--- a/test/sql/scaleAndSettings/sharedThroughput.spec.ts
+++ b/test/sql/scaleAndSettings/sharedThroughput.spec.ts
@@ -29,7 +29,7 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Create database with shared manual throughput and verify Scale node in UI", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
+      test.setTimeout(120000); // 2 minutes timeout
       // Create database with shared manual throughput (400 RU/s)
       dbContext = await createTestDB({ throughput: 400 });
 
@@ -47,7 +47,6 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Add container to shared database without dedicated throughput", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
       // Create database with shared manual throughput
       dbContext = await createTestDB({ throughput: 400 });
 
@@ -101,7 +100,6 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Scale shared database manual throughput", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
       // Create database with shared manual throughput (400 RU/s)
       dbContext = await createTestDB({ throughput: 400 });
 
@@ -127,7 +125,6 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Scale shared database from manual to autoscale", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
       // Create database with shared manual throughput (400 RU/s)
       dbContext = await createTestDB({ throughput: 400 });
 
@@ -162,7 +159,7 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Create database with shared autoscale throughput and verify Scale node in UI", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
+      test.setTimeout(120000); // 2 minutes timeout
 
       // Create database with shared autoscale throughput (max 1000 RU/s)
       dbContext = await createTestDB({ maxThroughput: 1000 });
@@ -181,7 +178,6 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Scale shared database autoscale throughput", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
       // Create database with shared autoscale throughput (max 1000 RU/s)
       dbContext = await createTestDB({ maxThroughput: 1000 });
 
@@ -207,7 +203,6 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Scale shared database from autoscale to manual", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
       // Create database with shared autoscale throughput (max 1000 RU/s)
       dbContext = await createTestDB({ maxThroughput: 1000 });