diff --git a/src/tests/normal-tests/ieee-fp.lsp b/src/tests/normal-tests/ieee-fp.lsp
index 21a673595..1b5d58793 100644
--- a/src/tests/normal-tests/ieee-fp.lsp
+++ b/src/tests/normal-tests/ieee-fp.lsp
@@ -11,11 +11,12 @@
 (suite 'ieee-fp)
 
 (defmacro without-fpe-traps (&body body)
-  `(unwind-protect
-        (progn
-          (si:trap-fpe 'last nil)
-          ,@body)
-     (si:trap-fpe 'last t)))
+  `(let ((bits (si:trap-fpe 'cl:last t)))
+     (unwind-protect
+          (progn
+            (si:trap-fpe t nil)
+            ,@body)
+       (si:trap-fpe bits t))))
 
 (test ieee-fp.0001.infinity-eql
   (without-fpe-traps