diff --git a/Jenkinsfile b/Jenkinsfile
index ac6b74b38ba..e1307045f64 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1053,7 +1053,8 @@ pipeline {
                             stash name: 'fault-inject-valgrind',
                                   includes: '*.memcheck.xml',
                                   allowEmpty: true
-                            archiveArtifacts artifacts: 'nlt_logs/el8.fault-injection/'
+                            archiveArtifacts artifacts: 'nlt_logs/el8.fault-injection/',
+                                             allowEmptyArchive: true
                             job_status_update()
                         }
                     }
diff --git a/utils/node_local_test.py b/utils/node_local_test.py
index 6ace1015df3..c7c7dd6a6d0 100755
--- a/utils/node_local_test.py
+++ b/utils/node_local_test.py
@@ -6395,7 +6395,17 @@ def run(wf, args):
     # If the perf-check option is given then re-start everything without much
     # debugging enabled and run some micro-benchmarks to give numbers for use
     # as a comparison against other builds.
+    run_fi = False
+
     if args.perf_check or fi_test or fi_test_dfuse:
+        fs = subprocess.run([os.path.join(conf['PREFIX'], 'bin', 'fault_status')], check=False)
+        print(fs)
+        if fs.returncode == 0:
+            run_fi = True
+        else:
+            print("Unable to detect fault injection feature, skipping testing")
+
+    if run_fi:
         args.server_debug = 'INFO'
         args.memcheck = 'no'
         args.dfuse_debug = 'WARN'