diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
index 99c13075..4604f4ee 100644
--- a/.github/workflows/code-checks.yml
+++ b/.github/workflows/code-checks.yml
@@ -7,10 +7,14 @@ on:
     branches: [ main ]
 
 jobs:
-  build-and-test:
-    name: Build and test
+  build-all:
+    name: Assemble all variants
+    strategy:
+      fail-fast: false
+      matrix:
+        flavor: [ Foss,Gplay ]
+        variant: [ Debug ]
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 11
@@ -19,16 +23,30 @@ jobs:
           java-version: '11'
           distribution: 'adopt'
           cache: gradle
-
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Build FOSS variant
-        run: ./gradlew assembleFossDebug
-      - name: Test FOSS variant
-        run: ./gradlew testFossDebugUnitTest
+      - name: Build (Flavor ${{ matrix.flavor }}, Variant ${{ matrix.variant }})
+        run: ./gradlew assemble${{ matrix.flavor }}${{ matrix.variant }}
+
+  test-all:
+    name: Run all tests
+    strategy:
+      fail-fast: false
+      matrix:
+        flavor: [ Foss,Gplay ]
+        variant: [ Release ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: gradle
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
 
-      - name: Build Google Play variant
-        run: ./gradlew assembleGplayDebug
-      - name: Test Google Play variant
-        run: ./gradlew testGplayDebugUnitTest
+      - name: Run tests (Flavor ${{ matrix.flavor }}, Variant ${{ matrix.variant }})
+        run: ./gradlew test${{ matrix.flavor }}${{ matrix.variant }}