diff --git a/.github/workflows/build_fuzzers.yml b/.github/workflows/build_fuzzers.yml
deleted file mode 100644
index efa4cc9c..00000000
--- a/.github/workflows/build_fuzzers.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Build Fuzzer
-
-on:
-  pull_request:
-  push:
-  release:
-    types:
-      - created
-
-jobs:
-  # ---------------------------------------
-  # Build all no-family (orphaned) boards
-  # ---------------------------------------
-  build-board:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        fuzz_harness:
-        - "device/cdc"
-        - "device/msc"
-        - "device/net"
-
-    steps:
-    - name: Setup Python
-      uses: actions/setup-python@v3
-
-    - name: Checkout TinyUSB
-      uses: actions/checkout@v3
-
-    - name: Fetch deps
-      run: | 
-       sudo apt update && sudo apt install libc++abi-dev libc++-dev
-       make CC=clang CXX=clang++ -C test/fuzz/${{ matrix.fuzz_harness }} get-deps
-
-    - name: Build Fuzzer
-      run: make CC=clang CXX=clang++ -C test/fuzz/${{ matrix.fuzz_harness }}
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 96a59069..ff52606e 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -34,4 +34,21 @@ jobs:
         # Install Ceedling
         gem install ceedling
         cd test/unit-test
-        ceedling test:all
\ No newline at end of file
+        ceedling test:all
+
+    - name: Fetch deps
+      run: |
+        sudo apt update && sudo apt install libc++abi-dev libc++-dev
+        fuzz_harness=$(ls -d test/fuzz/device/*/ test/fuzz/host/*/)
+        for h in $fuzz_harness
+        do
+          make $h get-deps
+        done
+
+    - name: Build Fuzzer
+      run: |
+        fuzz_harness=$(ls -d test/fuzz/device/*/ test/fuzz/host/*/)
+        for h in $fuzz_harness
+        do
+          make $h all
+        done
diff --git a/test/fuzz/make.mk b/test/fuzz/make.mk
index 3da79e8f..03254112 100644
--- a/test/fuzz/make.mk
+++ b/test/fuzz/make.mk
@@ -16,9 +16,9 @@ __check_defined = \
 
 #-------------- Fuzz harness compiler  ------------
 
-CC ?=  clang
-CXX ?= clang++
-GDB ?= gdb
+CC = clang
+CXX = clang++
+GDB = gdb
 OBJCOPY = objcopy
 SIZE = size
 MKDIR = mkdir