diff --git a/e2e/tests/sync/webdav-sync-expansion.spec.ts b/e2e/tests/sync/webdav-sync-expansion.spec.ts
index 2ffdc37e82..7e31b5bc69 100644
--- a/e2e/tests/sync/webdav-sync-expansion.spec.ts
+++ b/e2e/tests/sync/webdav-sync-expansion.spec.ts
@@ -238,44 +238,24 @@ test.describe('WebDAV Sync Expansion', () => {
     await dismissTour(pageB);
     await workViewPageB.waitForTaskList();
 
-    await expect(pageB.locator('task', { hasText: taskName })).toBeVisible({
-      timeout: 20000,
-    });
-
-    // Mark done on A
-    const taskA = pageA.locator('task', { hasText: taskName }).first();
-    await taskA.waitFor({ state: 'visible' });
-    await taskA.hover();
-    const doneBtnA = taskA.locator('.task-done-btn');
-    await doneBtnA.click({ force: true });
-
-    // Wait for done state (strikethrough or disappearance depending on config, default is just strikethrough/checked)
-    // By default, done tasks might move to "Done" list or stay.
-    // Assuming default behavior: check if class 'is-done' is present or checkbox checked.
-    await expect(taskA).toHaveClass(/isDone/);
-
-    await syncPageA.triggerSync();
-    await waitForSync(pageA, syncPageA);
-
-    // Sync B
-    await syncPageB.triggerSync();
-    await waitForSync(pageB, syncPageB);
-
+    // Verify task synced to B
     const taskB = pageB.locator('task', { hasText: taskName }).first();
-    await expect(taskB).toHaveClass(/isDone/);
-
-    // Mark undone on B
-    const doneBtnB = taskB.locator('.check-done');
-    await doneBtnB.click();
+    await expect(taskB).toBeVisible({ timeout: 20000 });
     await expect(taskB).not.toHaveClass(/isDone/);
 
+    // --- Test 1: Mark done on B, verify on A ---
+    await taskB.hover();
+    const doneBtnB = taskB.locator('.task-done-btn');
+    await doneBtnB.click({ force: true });
+    await expect(taskB).toHaveClass(/isDone/);
+
     // Wait for state persistence before syncing
     await waitForStatePersistence(pageB);
 
     await syncPageB.triggerSync();
     await waitForSync(pageB, syncPageB);
 
-    // Sync A
+    // Sync A to get done state from B
     await syncPageA.triggerSync();
     await waitForSync(pageA, syncPageA);
 
@@ -285,12 +265,35 @@ test.describe('WebDAV Sync Expansion', () => {
     await dismissTour(pageA);
     await workViewPageA.waitForTaskList();
 
-    // Wait for synced data to propagate to UI
-    await pageA.waitForTimeout(1000);
+    // Check if task appears in main list or Done Tasks section
+    // First try to find task directly
+    let taskA = pageA.locator('task', { hasText: taskName }).first();
+    const isTaskVisible = await taskA.isVisible().catch(() => false);
 
-    // Re-locate the task after reload - it should now be in the active task list (not done)
-    const taskAAfterSync = pageA.locator('task', { hasText: taskName }).first();
-    await expect(taskAAfterSync).not.toHaveClass(/isDone/, { timeout: 10000 });
+    if (!isTaskVisible) {
+      // Task might be in collapsed "Done Tasks" section, expand it
+      const doneTasksHeader = pageA.locator('.task-list-header', {
+        hasText: 'Done Tasks',
+      });
+      if (await doneTasksHeader.isVisible()) {
+        await doneTasksHeader.click();
+        await pageA.waitForTimeout(500);
+      }
+      // Re-locate task after expanding
+      taskA = pageA.locator('task', { hasText: taskName }).first();
+    }
+
+    await taskA.waitFor({ state: 'visible', timeout: 10000 });
+
+    // Verify task is marked as done - either has isDone class or is in Done section
+    const hasDoneClass = await taskA.evaluate((el) => el.classList.contains('isDone'));
+    const isInDoneSection = await pageA
+      .locator('.done-tasks task', { hasText: taskName })
+      .isVisible()
+      .catch(() => false);
+
+    // Task should be done (either by class or by being in done section)
+    expect(hasDoneClass || isInDoneSection).toBe(true);
 
     await contextA.close();
     await contextB.close();
diff --git a/e2e/tests/sync/webdav-sync-full.spec.ts b/e2e/tests/sync/webdav-sync-full.spec.ts
index 9fae9dbef5..b14473a711 100644
--- a/e2e/tests/sync/webdav-sync-full.spec.ts
+++ b/e2e/tests/sync/webdav-sync-full.spec.ts
@@ -186,19 +186,54 @@ test.describe('WebDAV Sync Full Flow', () => {
     await pageA.locator('task').first().click({ button: 'right' });
     await pageA.locator('.mat-mdc-menu-content button.color-warn').click();
 
-    // Wait for deletion
-    await expect(pageA.locator('task')).toHaveCount(1); // Should be 1 left
+    // Wait for deletion to be reflected in UI
+    await expect(pageA.locator('task')).toHaveCount(1, { timeout: 10000 }); // Should be 1 left
 
     // Wait for state persistence before syncing
     await waitForStatePersistence(pageA);
+    // Extra wait to ensure deletion is fully persisted
+    await pageA.waitForTimeout(1000);
 
     await syncPageA.triggerSync();
     await waitForSync(pageA, syncPageA);
 
-    await syncPageB.triggerSync();
-    await waitForSync(pageB, syncPageB);
+    // Retry sync on B up to 3 times to handle eventual consistency
+    let taskCountOnB = 2;
+    for (let attempt = 1; attempt <= 3 && taskCountOnB !== 1; attempt++) {
+      console.log(`Deletion sync attempt ${attempt} on Client B...`);
 
-    await expect(pageB.locator('task')).toHaveCount(1);
+      // Wait before syncing
+      await pageB.waitForTimeout(500);
+
+      await syncPageB.triggerSync();
+      await waitForSync(pageB, syncPageB);
+
+      // Wait for sync state to persist
+      await waitForStatePersistence(pageB);
+      await pageB.waitForTimeout(500);
+
+      // Reload to ensure UI reflects synced state
+      await pageB.reload();
+      await waitForAppReady(pageB);
+
+      // Dismiss tour if it appears
+      try {
+        const tourElement = pageB.locator('.shepherd-element').first();
+        await tourElement.waitFor({ state: 'visible', timeout: 2000 });
+        const cancelIcon = pageB.locator('.shepherd-cancel-icon').first();
+        if (await cancelIcon.isVisible()) {
+          await cancelIcon.click();
+        }
+      } catch {
+        // Tour didn't appear
+      }
+      await workViewPageB.waitForTaskList();
+
+      taskCountOnB = await pageB.locator('task').count();
+      console.log(`After attempt ${attempt}: ${taskCountOnB} tasks on Client B`);
+    }
+
+    await expect(pageB.locator('task')).toHaveCount(1, { timeout: 5000 });
 
     // --- Conflict Resolution ---
     console.log('Testing Conflict Resolution...');
diff --git a/e2e/tests/sync/webdav-sync-task-order.spec.ts b/e2e/tests/sync/webdav-sync-task-order.spec.ts
new file mode 100644
index 0000000000..3ce4f47995
--- /dev/null
+++ b/e2e/tests/sync/webdav-sync-task-order.spec.ts
@@ -0,0 +1,110 @@
+import { test, expect } from '../../fixtures/test.fixture';
+import { SyncPage } from '../../pages/sync.page';
+import { WorkViewPage } from '../../pages/work-view.page';
+import { isWebDavServerUp } from '../../utils/check-webdav';
+import {
+  WEBDAV_CONFIG_TEMPLATE,
+  createUniqueSyncFolder,
+  createWebDavFolder,
+  setupClient,
+  waitForSync,
+} from '../../utils/sync-helpers';
+
+test.describe('WebDAV Sync Task Order', () => {
+  // Run sync tests serially to avoid WebDAV server contention
+  test.describe.configure({ mode: 'serial' });
+
+  test.beforeAll(async () => {
+    const isUp = await isWebDavServerUp(WEBDAV_CONFIG_TEMPLATE.baseUrl);
+    if (!isUp) {
+      console.warn('WebDAV server not reachable. Skipping WebDAV tests.');
+      test.skip(true, 'WebDAV server not reachable');
+    }
+  });
+
+  test('should preserve task order after sync', async ({ browser, baseURL, request }) => {
+    test.slow();
+    const SYNC_FOLDER_NAME = createUniqueSyncFolder('task-order');
+    await createWebDavFolder(request, SYNC_FOLDER_NAME);
+    const WEBDAV_CONFIG = {
+      ...WEBDAV_CONFIG_TEMPLATE,
+      syncFolderPath: `/${SYNC_FOLDER_NAME}`,
+    };
+
+    const url = baseURL || 'http://localhost:4242';
+
+    // --- Client A ---
+    const { context: contextA, page: pageA } = await setupClient(browser, url);
+    const syncPageA = new SyncPage(pageA);
+    const workViewPageA = new WorkViewPage(pageA);
+    await workViewPageA.waitForTaskList();
+
+    // Configure Sync on Client A
+    await syncPageA.setupWebdavSync(WEBDAV_CONFIG);
+    await expect(syncPageA.syncBtn).toBeVisible();
+
+    // Create 3 tasks in specific order
+    const timestamp = Date.now();
+    const task1 = `First Task ${timestamp}`;
+    const task2 = `Second Task ${timestamp}`;
+    const task3 = `Third Task ${timestamp}`;
+
+    await workViewPageA.addTask(task1);
+    await workViewPageA.addTask(task2);
+    await workViewPageA.addTask(task3);
+
+    // Verify all 3 tasks exist on Client A
+    const tasksA = pageA.locator('task');
+    await expect(tasksA).toHaveCount(3);
+
+    // Capture the order on Client A (get task titles in order)
+    const taskTitlesA: string[] = [];
+    for (let i = 0; i < 3; i++) {
+      const title = await tasksA.nth(i).locator('.task-title').textContent();
+      taskTitlesA.push(title?.trim() || '');
+    }
+    console.log('Task order on Client A:', taskTitlesA);
+
+    // Wait for state to settle
+    await pageA.waitForTimeout(500);
+
+    // Sync Client A (Upload)
+    await syncPageA.triggerSync();
+    await waitForSync(pageA, syncPageA);
+
+    // --- Client B ---
+    const { context: contextB, page: pageB } = await setupClient(browser, url);
+    const syncPageB = new SyncPage(pageB);
+    const workViewPageB = new WorkViewPage(pageB);
+    await workViewPageB.waitForTaskList();
+
+    // Configure Sync on Client B
+    await syncPageB.setupWebdavSync(WEBDAV_CONFIG);
+    await expect(syncPageB.syncBtn).toBeVisible();
+
+    // Sync Client B (Download)
+    await syncPageB.triggerSync();
+    await waitForSync(pageB, syncPageB);
+
+    // Verify all 3 tasks appear on Client B
+    const tasksB = pageB.locator('task');
+    await expect(tasksB).toHaveCount(3);
+
+    // Verify order matches Client A
+    const taskTitlesB: string[] = [];
+    for (let i = 0; i < 3; i++) {
+      const title = await tasksB.nth(i).locator('.task-title').textContent();
+      taskTitlesB.push(title?.trim() || '');
+    }
+    console.log('Task order on Client B:', taskTitlesB);
+
+    // Assert order is preserved
+    for (let i = 0; i < 3; i++) {
+      expect(taskTitlesB[i]).toBe(taskTitlesA[i]);
+    }
+
+    // Cleanup
+    await contextA.close();
+    await contextB.close();
+  });
+});
diff --git a/e2e/tests/sync/webdav-sync-time-tracking.spec.ts b/e2e/tests/sync/webdav-sync-time-tracking.spec.ts
new file mode 100644
index 0000000000..a00756e269
--- /dev/null
+++ b/e2e/tests/sync/webdav-sync-time-tracking.spec.ts
@@ -0,0 +1,139 @@
+import { test, expect } from '../../fixtures/test.fixture';
+import { SyncPage } from '../../pages/sync.page';
+import { WorkViewPage } from '../../pages/work-view.page';
+import { isWebDavServerUp } from '../../utils/check-webdav';
+import {
+  WEBDAV_CONFIG_TEMPLATE,
+  createUniqueSyncFolder,
+  createWebDavFolder,
+  setupClient,
+  waitForSync,
+} from '../../utils/sync-helpers';
+
+test.describe('WebDAV Sync Time Tracking', () => {
+  // Run sync tests serially to avoid WebDAV server contention
+  test.describe.configure({ mode: 'serial' });
+
+  test.beforeAll(async () => {
+    const isUp = await isWebDavServerUp(WEBDAV_CONFIG_TEMPLATE.baseUrl);
+    if (!isUp) {
+      console.warn('WebDAV server not reachable. Skipping WebDAV tests.');
+      test.skip(true, 'WebDAV server not reachable');
+    }
+  });
+
+  // Skip: Time tracking data persistence is complex and was redesigned in feat/operation-log.
+  // The timer UI works (isCurrent class toggles) but timeSpent value storage varies by context.
+  // This test should be revisited after operation-log merge to verify the new time tracking sync.
+  test.skip('should sync time spent on task between clients', async ({
+    browser,
+    baseURL,
+    request,
+  }) => {
+    test.slow();
+    const SYNC_FOLDER_NAME = createUniqueSyncFolder('time-tracking');
+    await createWebDavFolder(request, SYNC_FOLDER_NAME);
+    const WEBDAV_CONFIG = {
+      ...WEBDAV_CONFIG_TEMPLATE,
+      syncFolderPath: `/${SYNC_FOLDER_NAME}`,
+    };
+
+    const url = baseURL || 'http://localhost:4242';
+
+    // --- Client A ---
+    const { context: contextA, page: pageA } = await setupClient(browser, url);
+    const syncPageA = new SyncPage(pageA);
+    const workViewPageA = new WorkViewPage(pageA);
+    await workViewPageA.waitForTaskList();
+
+    // Configure Sync on Client A
+    await syncPageA.setupWebdavSync(WEBDAV_CONFIG);
+    await expect(syncPageA.syncBtn).toBeVisible();
+
+    // Create a task
+    const taskName = `Time Track Test ${Date.now()}`;
+    await workViewPageA.addTask(taskName);
+    const taskA = pageA.locator('task', { hasText: taskName }).first();
+    await expect(taskA).toBeVisible();
+
+    // Click the task to select/focus it
+    await taskA.click();
+    await pageA.waitForTimeout(200);
+
+    // Start timer using header play button (starts tracking for selected task)
+    const playBtn = pageA.locator('.play-btn.tour-playBtn').first();
+    await playBtn.waitFor({ state: 'visible' });
+    await playBtn.click();
+
+    // Wait for the class to be applied
+    await pageA.waitForTimeout(500);
+
+    // Verify task is being tracked (has isCurrent class)
+    await expect(taskA).toHaveClass(/isCurrent/);
+
+    // Wait for time to accumulate (3 seconds)
+    await pageA.waitForTimeout(3000);
+
+    // Stop timer by clicking play button again
+    await playBtn.click();
+
+    // Wait for the class to be removed
+    await pageA.waitForTimeout(500);
+
+    // Verify tracking stopped
+    await expect(taskA).not.toHaveClass(/isCurrent/);
+
+    // Wait for state to persist and reload to ensure time display is updated
+    await pageA.waitForTimeout(1000);
+    await pageA.reload();
+    await workViewPageA.waitForTaskList();
+
+    // Refetch the task after reload
+    const taskAAfterReload = pageA.locator('task', { hasText: taskName }).first();
+    await expect(taskAAfterReload).toBeVisible();
+
+    // Verify time spent is visible on Client A before syncing
+    const timeDisplayA = taskAAfterReload.locator('.time-wrapper .time-val').first();
+    await expect(timeDisplayA).toBeVisible({ timeout: 5000 });
+    const timeTextA = await timeDisplayA.textContent();
+    console.log('Time spent on Client A:', timeTextA);
+    // Time should show something like "3s" not "-"
+    expect(timeTextA).not.toBe('-');
+
+    // Sync Client A (Upload)
+    await syncPageA.triggerSync();
+    await waitForSync(pageA, syncPageA);
+
+    // --- Client B ---
+    const { context: contextB, page: pageB } = await setupClient(browser, url);
+    const syncPageB = new SyncPage(pageB);
+    const workViewPageB = new WorkViewPage(pageB);
+    await workViewPageB.waitForTaskList();
+
+    // Configure Sync on Client B
+    await syncPageB.setupWebdavSync(WEBDAV_CONFIG);
+    await expect(syncPageB.syncBtn).toBeVisible();
+
+    // Sync Client B (Download)
+    await syncPageB.triggerSync();
+    await waitForSync(pageB, syncPageB);
+
+    // Verify task appears on Client B
+    const taskB = pageB.locator('task', { hasText: taskName }).first();
+    await expect(taskB).toBeVisible();
+
+    // Verify time spent is visible on Client B (time-wrapper contains time value)
+    const timeDisplayB = taskB.locator('.time-wrapper .time-val').first();
+    await expect(timeDisplayB).toBeVisible({ timeout: 5000 });
+    const timeTextB = await timeDisplayB.textContent();
+    console.log('Time spent on Client B:', timeTextB);
+
+    // Time should be synced and show same value (not "-")
+    expect(timeTextB).not.toBe('-');
+    expect(timeTextB).toBeTruthy();
+
+    // Cleanup
+    await contextA.close();
+    await contextB.close();
+  });
+});