diff --git a/slurm.changes b/slurm.changes
index 7193a6d..8517e10 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 14 15:20:46 UTC 2022 - Egbert Eich <eich@suse.com>
+
+- Improve check for mpicc in testsuite package: if binary isn't
+  found, don't crash.
+
 -------------------------------------------------------------------
 Mon Jun 20 09:23:17 UTC 2022 - Christian Goll <cgoll@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index 870aa38..dc231c2 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -864,7 +864,9 @@ cat > %{buildroot}/srv/slurm-testsuite/testsuite/expect/globals.local <<EOF
 set slurm_dir "/usr"
 set build_dir "/srv/slurm-testsuite"
 set src_dir "/srv/slurm-testsuite"
-set mpicc   [ exec which mpicc ]
+if {[ catch { set mpicc [ exec which mpicc 2>/dev/null ]}]} {
+  set mpicc ""
+}
 set testsuite_user "auser"
 #set testsuite_cleanup_on_failure false
 EOF