diff --git a/test/boost_no_fenv_h.ipp b/test/boost_no_fenv_h.ipp
index 97ed5124..7bfe4446 100644
--- a/test/boost_no_fenv_h.ipp
+++ b/test/boost_no_fenv_h.ipp
@@ -8,7 +8,7 @@
 
 //  MACRO:         BOOST_NO_FENV_H
 //  TITLE:         fenv.h
-//  DESCRIPTION:   There is no POSIX <fenv.h> available. If <fenv.h> is
+//  DESCRIPTION:   There is no standard <fenv.h> available. If <fenv.h> is
 //                 available, <boost/detail/fenv.hpp> should be included
 //                 instead of directly including <fenv.h>.
 
@@ -18,11 +18,11 @@ namespace boost_no_fenv_h {
 
 int test()
 {
-  /// POSIX required typedefs
+  /// C++0x required typedefs
   typedef ::fenv_t has_fenv_t;
   typedef ::fexcept_t has_fexcept_t;
 
-  /// POSIX required macros
+  /// C++0x required macros
   #if !defined(FE_DIVBYZERO)
     #error platform does not define FE_DIVBYZERO
   #endif
@@ -31,47 +31,23 @@ int test()
     #error platform does not define FE_INEXACT
   #endif
 
-  #if !defined(FE_INVALID)
-    #error platform does not define FE_INVALID
+  #if !defined(FE_ALL_EXCEPT)
+    #error platform does not define FE_ALL_EXCEPT
   #endif
   
-  #if !defined(FE_OVERFLOW)
-    #error platform does not define FE_OVERFLOW
-  #endif
+   int (*has_feclearexcept)(int ) = ::feclearexcept;
+   int (*has_fegetexceptflag)(fexcept_t *, int ) = fegetexceptflag;
+   int (*has_feraiseexcept)(int ) = feraiseexcept;
+   int (*has_fesetexceptflag)(const fexcept_t *, int ) = fesetexceptflag;
+   int (*has_fetestexcept)(int ) = fetestexcept;
+   int (*has_fegetround)(void) = fegetround;
+   int (*has_fesetround)(int ) = fesetround;
+   int (*has_fegetenv)(fenv_t *) = fegetenv;
+   int (*has_feholdexcept)(fenv_t *) = feholdexcept;
+   int (*has_fesetenv)(const fenv_t *) = fesetenv;
+   int (*has_feupdateenv)(const fenv_t *) = feupdateenv;
 
-  #if !defined(FE_UNDERFLOW)
-    #error platform does not define FE_UNDERFLOW
-  #endif
-  
-  #if !defined(FE_DOWNWARD)
-    #error platform does not define FE_DOWNWARD
-  #endif
- 
-  #if !defined(FE_TONEAREST)
-    #error platform does not define FE_TONEAREST
-  #endif
-  
-  #if !defined(FE_UPWARD)
-    #error platform does not define FE_UPWARD
-  #endif
-
-  #if !defined(FE_DFL_ENV)
-    #error platform does not define FE_DFL_ENV
-  #endif
-
-  int (*has_feclearexcept)(int) = ::feclearexcept;
-  int (*has_fegetenv)(fenv_t*) = ::fegetenv;
-  int (*has_fegetexcept)(fexcept_t*, int) = ::fegetexcept;
-  int (*has_fegetround)(void) = ::fegetround;
-  int (*has_feholdexcept)(fenv_t*) = ::feholdexcept;
-  int (*has_feraiseexcept)(int) = ::feraiseexcept;
-  int (*has_fesetenv)(const fenv_t*) = ::fesetenv;
-  int (*has_fesetexceptflag)(const fexcept_t*, int) = ::fesetexceptflag;
-  int (*has_fesetround)(int) = ::fesetround;
-  int (*has_fetestexcept)(int) = ::fetestexcept;
-  int (*has_feupdateenv)(const fenv_t*) = ::feupdateenv;
-
-  return 0;
+   return 0;
 }
 
 }