diff --git a/.github/workflows/build_bromite.yaml b/.github/workflows/build_bromite.yaml
index 739bbd7..0de78bb 100644
--- a/.github/workflows/build_bromite.yaml
+++ b/.github/workflows/build_bromite.yaml
@@ -138,6 +138,7 @@ jobs:
     runs-on: self-hosted
     needs: check_images
     if: success()
+    timeout-minutes: 720
 
     services:      
       gomaserver:
@@ -287,6 +288,37 @@ jobs:
           cp out/bromite/dump_syms $ARTIFACS_DIR/symbols
           echo "::endgroup::"
 
+      - name: Build junit tests
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+          
+          autoninja -j $GOMAJOBS -C out/bromite chrome_junit_tests
+          autoninja -j $GOMAJOBS -C out/bromite components_junit_tests
+          autoninja -j $GOMAJOBS -C out/bromite content_junit_tests
+          autoninja -j $GOMAJOBS -C out/bromite base_junit_tests
+          autoninja -j $GOMAJOBS -C out/bromite ui_junit_tests
+          
+      - name: Build c++ tests
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+          
+          autoninja -j $GOMAJOBS -C out/bromite network_service
+          autoninja -j $GOMAJOBS -C out/bromite unit_tests
+          autoninja -j $GOMAJOBS -C out/bromite content_browsertests
+          autoninja -j $GOMAJOBS -C out/bromite components_unittests
+          
+      - name: Build instrumentation tests
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+          autoninja -j $GOMAJOBS -C out/bromite content_shell_test_apk
+          autoninja -j $GOMAJOBS -C out/bromite chrome_public_test_apk
+
       - name: Sync out folder
         shell: bash
         run: |