diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
index 4604f4ee..9bfa78cb 100644
--- a/.github/workflows/code-checks.yml
+++ b/.github/workflows/code-checks.yml
@@ -7,18 +7,19 @@ on:
     branches: [ main ]
 
 jobs:
-  build-all:
-    name: Assemble all variants
+  build-modules:
+    name: Build apps
     strategy:
       fail-fast: false
       matrix:
         flavor: [ Foss,Gplay ]
         variant: [ Debug ]
+        module: [ app,app-wear ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -26,21 +27,21 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Build (Flavor ${{ matrix.flavor }}, Variant ${{ matrix.variant }})
-        run: ./gradlew assemble${{ matrix.flavor }}${{ matrix.variant }}
+      - name: Build module
+        run: ./gradlew ${{ matrix.module }}:assemble${{ matrix.flavor }}${{ matrix.variant }}
 
-  test-all:
-    name: Run all tests
+  test-modules:
+    name: Unit tests
     strategy:
       fail-fast: false
       matrix:
-        flavor: [ Foss,Gplay ]
         variant: [ Release ]
+        flavor: [ test,testFoss,testGplay ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -48,5 +49,5 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Run tests (Flavor ${{ matrix.flavor }}, Variant ${{ matrix.variant }})
-        run: ./gradlew test${{ matrix.flavor }}${{ matrix.variant }}
+      - name: Test modules
+        run: ./gradlew ${{ matrix.flavor }}${{ matrix.variant }}UnitTest
\ No newline at end of file