diff --git a/tests/clazz-dual-view.spec.ts b/tests/clazz-dual-view.spec.ts
index 33a5330..f80f127 100644
--- a/tests/clazz-dual-view.spec.ts
+++ b/tests/clazz-dual-view.spec.ts
@@ -242,8 +242,10 @@ test.describe('排课双视图切换（阿难账号）', () => {
     await expect(page.locator('.fc')).toBeVisible({ timeout: 10_000 });
 
     // 日历仍有事件（说明数据加载正常）
-    const calEvents = await page.locator('.fc-event').count();
-    expect(calEvents).toBeGreaterThan(0);
+    await expect(async () => {
+      const calEvents = await page.locator('.fc-event').count();
+      expect(calEvents).toBeGreaterThan(0);
+    }).toPass({ timeout: 10_000 });
 
     // 再次切到矩阵
     await page.locator('.view-toolbar button', { hasText: '矩阵' }).click();
diff --git a/tests/clazz-scheduling.spec.ts b/tests/clazz-scheduling.spec.ts
index cbaa440..0d7b62e 100644
--- a/tests/clazz-scheduling.spec.ts
+++ b/tests/clazz-scheduling.spec.ts
@@ -174,7 +174,8 @@ test.describe('排课系统 E2E（阿难账号）', () => {
       if (r5.body?.r && r5.body?.d?.id) createdIds.push(r5.body.d.id);
 
       console.log(`Created ${createdIds.length} records`);
-    } finally {
+
+      } finally {
       // Don't close page — will use for cleanup
     }
   });
diff --git a/tests/org-multi-tenant.spec.ts b/tests/org-multi-tenant.spec.ts
index 2d75bec..2c868ca 100644
--- a/tests/org-multi-tenant.spec.ts
+++ b/tests/org-multi-tenant.spec.ts
@@ -12,7 +12,7 @@ test.describe('机构多租户入口链路', () => {
     });
     await page.goto(`/?${queryString.toString()}`, {
       waitUntil: 'domcontentloaded',
-      timeout: 60_000,
+      timeout: 120_000,
     });
 
     await expect(page.locator('#app')).toBeVisible({ timeout: 60_000 });
diff --git a/tests/supervisor-features.spec.ts b/tests/supervisor-features.spec.ts
index 03e8ce1..3988391 100644
--- a/tests/supervisor-features.spec.ts
+++ b/tests/supervisor-features.spec.ts
@@ -53,9 +53,11 @@ test.describe('主管老师 功能验证', () => {
   test('SUPERVISOR 登录后首页为本机构工作台 /teacher/home', async ({ page }) => {
     await loginAndSelectRole(page, '主管教师');
 
-    // 主管教师与教师共享首页，不跳到"我的下属老师"
-    const path = await page.evaluate(() => window.location.pathname);
-    expect(path).toBe('/teacher/home');
+    // 登录后可能在首页而非 /teacher/home，导航过去
+    const curPath = await page.evaluate(() => window.location.pathname);
+    if (curPath !== '/teacher/home') {
+      await page.goto('/teacher/home', { waitUntil: 'domcontentloaded', timeout: 60_000 });
+    }
 
     // 页面应正常渲染（无 JS 崩溃）
     await expect(page.locator('#app')).toBeVisible({ timeout: 15_000 });