diff --git a/.github/workflows/testsuite_allprocesses.yml b/.github/workflows/testsuite_allprocesses.yml
index 7eaad09c9f..5101a83625 100644
--- a/.github/workflows/testsuite_allprocesses.yml
+++ b/.github/workflows/testsuite_allprocesses.yml
@@ -37,5 +37,6 @@ jobs:
     uses: ./.github/workflows/testsuite_oneprocess.yml
     with:
       process: ${{ matrix.process }}.${{ matrix.suffix }}
+      enableFPE: github.event_name != 'pull_request'
 
 #----------------------------------------------------------------------------------------------------------------------------------
diff --git a/.github/workflows/testsuite_oneprocess.sh b/.github/workflows/testsuite_oneprocess.sh
index 639991f1cb..f4773f8481 100755
--- a/.github/workflows/testsuite_oneprocess.sh
+++ b/.github/workflows/testsuite_oneprocess.sh
@@ -233,6 +233,11 @@ function tput_test() {
   done
 }
 
+# Tput-test with FPEs enabled
+function tput_test_fpe() {
+  CUDACPP_RUNTIME_ENABLEFPE=1 tput_test $*
+}
+
 #----------------------------------------------------------------------------------------------------------------------------------
 
 # Usage
@@ -244,7 +249,7 @@ function usage() {
 #----------------------------------------------------------------------------------------------------------------------------------
 
 # Valid stages
-stages="codegen before_build build after_build tput_test"
+stages="codegen before_build build after_build tput_test tput_test_fpe"
 
 # Check input arguments
 for astage in $stages; do
diff --git a/.github/workflows/testsuite_oneprocess.yml b/.github/workflows/testsuite_oneprocess.yml
index 0d0973f210..f09cc60375 100644
--- a/.github/workflows/testsuite_oneprocess.yml
+++ b/.github/workflows/testsuite_oneprocess.yml
@@ -36,6 +36,11 @@ on:
         type: choice
         # FIXME? Can the list of supported processes be specified only once in oneprocess.yml or allprocesses.yml?
         options: [gg_tt.mad, gg_ttg.mad, gg_ttgg.mad, gg_ttggg.mad, ee_mumu.mad]
+      enableFPE:
+        description: 'Enable FPE tests?'
+        default: true
+        required: true
+        type: boolean
 
 #----------------------------------------------------------------------------------------------------------------------------------
 
@@ -134,6 +139,10 @@ jobs:
     - name: tput_test
       run: .github/workflows/testsuite_oneprocess.sh tput_test ${{ inputs.process }}
 
+    - name: tput_test_fpe
+      run: .github/workflows/testsuite_oneprocess.sh tput_test_fpe ${{ inputs.process }}
+      if: ${{ inputs.enableFPE }}
+
     - name: GOODBYE
       run: |
         echo "GOODBYE ${{ inputs.process }}! $(date)"