diff --git a/src/libCom/test/epicsCalcTest.cpp b/src/libCom/test/epicsCalcTest.cpp
index 5b8081369..77a77079f 100644
--- a/src/libCom/test/epicsCalcTest.cpp
+++ b/src/libCom/test/epicsCalcTest.cpp
@@ -89,6 +89,8 @@ void testBadExpr(const char *expr, short expected_err) {
 #ifndef PI
 #define PI 3.14159265358979
 #endif
+#define Inf epicsINF
+#define NaN epicsNAN
 #define D2R (PI/180.)
 #define R2D (180./PI)
 #define ABS(x) fabs(x)
@@ -195,10 +197,6 @@ MAIN(epicsCalcTest)
     int repeat;
     const double a=1.0, b=2.0, c=3.0, d=4.0, e=5.0, f=6.0,
 		 g=7.0, h=8.0, i=9.0, j=10.0, k=11.0, l=12.0;
-    double Inf = 1.0;
-    double NaN = 0.0;
-    Inf /= NaN;
-    NaN /= NaN;
     
     testPlan(533);