diff --git a/.gitea/workflows/build-and-test.yml b/.gitea/workflows/build-and-test.yml
index 320ec77..751ca1c 100644
--- a/.gitea/workflows/build-and-test.yml
+++ b/.gitea/workflows/build-and-test.yml
@@ -99,6 +99,12 @@ jobs:
       - name: Build frontend
         run: bun run build
 
+      - name: Initialize Android project
+        run: |
+          cd src-tauri
+          echo "" | bunx tauri android init
+          cd ..
+
       - name: Build Android APK
         id: build
         run: |
diff --git a/src/lib/api/backend-integration.test.ts b/src/lib/api/backend-integration.test.ts
index e33da8b..8ec574a 100644
--- a/src/lib/api/backend-integration.test.ts
+++ b/src/lib/api/backend-integration.test.ts
@@ -2,11 +2,9 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 import { invoke } from "@tauri-apps/api/core";
 import { RepositoryClient } from "./repository-client";
 
-const mockInvoke = vi.fn();
+vi.mock("@tauri-apps/api/core");
 
-vi.mock("@tauri-apps/api/core", () => ({
-  invoke: mockInvoke,
-}));
+const mockInvoke = vi.mocked(invoke);
 
 /**
  * Integration tests documenting Phase 1 & 2 refactoring:
diff --git a/src/lib/api/repository-client.test.ts b/src/lib/api/repository-client.test.ts
index c04c343..df75929 100644
--- a/src/lib/api/repository-client.test.ts
+++ b/src/lib/api/repository-client.test.ts
@@ -2,11 +2,9 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 import { invoke } from "@tauri-apps/api/core";
 import { RepositoryClient } from "./repository-client";
 
-const mockInvoke = vi.fn();
+vi.mock("@tauri-apps/api/core");
 
-vi.mock("@tauri-apps/api/core", () => ({
-  invoke: mockInvoke,
-}));
+const mockInvoke = vi.mocked(invoke);
 
 describe("RepositoryClient", () => {
   let client: RepositoryClient;