diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml
new file mode 100644
index 00000000000..5b11d82937b
--- /dev/null
+++ b/.github/workflows/Android-CI.yml
@@ -0,0 +1,58 @@
+name: Android CI
+
+on: [push]
+
+jobs:
+  Wrapper_validation:
+    name: "Gradlew wrapper validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
+  Build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Upload reports
+        uses: actions/upload-artifact@v2
+        if: ${{ always() }}
+        with:
+          name: reports
+          path: ${{ github.workspace }}/owncloudApp/build
+      - name: Upload debug/release build
+        uses: actions/upload-artifact@v2
+        if: ${{ always() }}
+        with:
+          name: builds
+          path: ${{ github.workspace }}/owncloudApp/build/outputs/apk
+  Espresso_test:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Android Emulator test
+        uses: ReactiveCircus/android-emulator-runner@v2.11.0
+        with:
+          api-level: 28
+          disable-animations: true
+          arch: x86_64
+          profile: Nexus 6
+          script: ./gradlew connectedAndroidTest
+      - uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: owncloudApp-Espresso-test-report
+          path: ${{ github.workspace }}/owncloudApp/build/reports/androidTests/connected/*
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
deleted file mode 100644
index f365456a1e3..00000000000
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: "Validate Gradle Wrapper"
-on: [pull_request]
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1