diff --git a/test/unittests/execute_floating_point_test.cpp b/test/unittests/execute_floating_point_test.cpp
index d16632414..2481fa4c7 100644
--- a/test/unittests/execute_floating_point_test.cpp
+++ b/test/unittests/execute_floating_point_test.cpp
@@ -247,13 +247,13 @@ TYPED_TEST(execute_floating_point_trunc, trunc)
         // NaNs.
         EXPECT_THAT(execute(*instance, 0, {FloatLimits::quiet_NaN()}), Traps());
         EXPECT_THAT(execute(*instance, 0, {FloatLimits::signaling_NaN()}), Traps());
-        EXPECT_THAT(execute(*instance, 0, {nan<FloatT>()}), Traps());
-        EXPECT_THAT(execute(*instance, 0, {-nan<FloatT>()}), Traps());
-        EXPECT_THAT(execute(*instance, 0, {nan<FloatT>(1)}), Traps());
-        EXPECT_THAT(execute(*instance, 0, {-nan<FloatT>(1)}), Traps());
-        EXPECT_THAT(execute(*instance, 0, {nan<FloatT>(0xdead)}), Traps());
-        EXPECT_THAT(execute(*instance, 0, {-nan<FloatT>(0xdead)}), Traps());
-        const auto signaling_nan = nan<FloatT>(FPUtils<FloatT>::CanonicalNaNPayload >> 1);
+        EXPECT_THAT(execute(*instance, 0, {FP<FloatT>::nan()}), Traps());
+        EXPECT_THAT(execute(*instance, 0, {-FP<FloatT>::nan()}), Traps());
+        EXPECT_THAT(execute(*instance, 0, {FP<FloatT>::nan(1)}), Traps());
+        EXPECT_THAT(execute(*instance, 0, {-FP<FloatT>::nan(1)}), Traps());
+        EXPECT_THAT(execute(*instance, 0, {FP<FloatT>::nan(0xdead)}), Traps());
+        EXPECT_THAT(execute(*instance, 0, {-FP<FloatT>::nan(0xdead)}), Traps());
+        const auto signaling_nan = FP<FloatT>::nan(FP<FloatT>::canon >> 1);
         EXPECT_THAT(execute(*instance, 0, {signaling_nan}), Traps());
         EXPECT_THAT(execute(*instance, 0, {-signaling_nan}), Traps());