diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 7602419..2022c3f 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -33,5 +33,17 @@ jobs:
       - name: Build APKs
         run: make tailscale-debug.apk
 
-      - name: Run tests
+      - name: Run Unit Tests
         run: make test
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Start emulator
+        run: |
+          adb devices
+          adb wait-for-device
+          adb shell input keyevent 82 &
+
+      - name: Run Integration Tests 
+        run: make integration-test
diff --git a/Makefile b/Makefile
index 273f419..de2edb5 100644
--- a/Makefile
+++ b/Makefile
@@ -316,6 +316,10 @@ checkandroidsdk: ## Check that Android SDK is installed
 test: gradle-dependencies ## Run the Android tests
 	(cd android && ./gradlew test)
 
+.PHONY: integration-test
+integration-test: gradle-dependencies ## Run the integration tests
+	(cd android && ./gradlew connectedAndroidTest)
+
 .PHONY: emulator
 emulator: ## Start an android emulator instance
 	@echo "Checking installed SDK packages..."