diff --git a/.github/workflows/get_and_run_tests.yml b/.github/workflows/get_and_run_tests.yml
index ef008afb68..4ee002b3c9 100644
--- a/.github/workflows/get_and_run_tests.yml
+++ b/.github/workflows/get_and_run_tests.yml
@@ -14,6 +14,10 @@ on:
                 required: false
                 type: boolean
                 default: false
+            fuzz:
+                required: false
+                type: boolean
+                default: false
 
 jobs:
     prepare-test-environment:
@@ -49,3 +53,4 @@ jobs:
             test_infos: ${{ needs.prepare-test-environment.outputs.test-infos }}
             include_npm: ${{ needs.prepare-test-environment.outputs.include_npm == 'true' }}
             run_experimental: ${{ inputs.run_experimental }}
+            fuzz: ${{ inputs.fuzz }}
diff --git a/.github/workflows/run_test.yml b/.github/workflows/run_test.yml
index caf6c1ed56..f7815fdc1e 100644
--- a/.github/workflows/run_test.yml
+++ b/.github/workflows/run_test.yml
@@ -13,6 +13,10 @@ on:
                 required: false
                 type: boolean
                 default: false
+            fuzz:
+                required: false
+                type: boolean
+                default: false
 
 jobs:
     run-test:
@@ -141,3 +145,4 @@ jobs:
                   AZLE_PROPTEST_NUM_RUNS: ${{ steps.calc-runs.outputs.runs }}
                   AZLE_PROPTEST_VERBOSE: true
                   AZLE_EXPERIMENTAL: ${{ inputs.run_experimental }}
+                  AZLE_FUZZ: ${{ inputs.fuzz }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c09b386258..027db26bfa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,6 +10,18 @@ on:
         branches:
             - main
     pull_request:
+        types:
+            - opened
+            - synchronize
+            - ready_for_review
+            - reopened
+    workflow_dispatch:
+        inputs:
+            fuzz:
+                description: 'Run fuzz tests'
+                required: true
+                type: boolean
+                default: false
 
 jobs:
     get-exclude-dirs:
@@ -88,6 +100,7 @@ jobs:
             directories: ${{ matrix.test_group.directories }}
             exclude-dirs: ${{ needs.get-exclude-dirs.outputs.exclude-dirs }}
             run_experimental: ${{ matrix.test_group.run_experimental || false }}
+            fuzz: ${{ inputs.fuzz || false }}
 
     check-test-success:
         name: Check Azle tests succeeded