diff --git a/Polynomial/test/Polynomial/Polynomial_traits_d.cpp b/Polynomial/test/Polynomial/Polynomial_traits_d.cpp
index 359dc8c7661..8b4b1d3295f 100644
--- a/Polynomial/test/Polynomial/Polynomial_traits_d.cpp
+++ b/Polynomial/test/Polynomial/Polynomial_traits_d.cpp
@@ -74,6 +74,10 @@ void test_AT(){
   CGAL::Test_Pol::test_multiple_dimensions(PT());   
   }
   {
+  //  Enforce IEEE double precision and to nearest before 
+  //  using modular arithmetic
+  CGAL::Protect_FPU_rounding<true> pfr(CGAL_FE_TONEAREST);
+
   typedef CGAL::Polynomial< CGAL::Residue > Poly;
   typedef CGAL::Polynomial_traits_d<Poly> PT;
   std::cerr << std::endl;
@@ -83,8 +87,6 @@ void test_AT(){
   std::cerr << 
     "----------------------------------------------------------------------"
             << std::endl;    
- //  Enforce IEEE double precision before using modular arithmetic
-  CGAL::Set_ieee_double_precision pfr;
   CGAL::Test_Pol::test_multiple_dimensions(PT());   
   }
 }    
diff --git a/Polynomial/test/Polynomial/resultant.cpp b/Polynomial/test/Polynomial/resultant.cpp
index a0aeaa30965..d5222bccada 100644
--- a/Polynomial/test/Polynomial/resultant.cpp
+++ b/Polynomial/test/Polynomial/resultant.cpp
@@ -105,8 +105,8 @@ int main(){
   test_resultant<E2Polynomial_1>();
 
 
-  // Enforce IEEE double precision before using modular arithmetic
-  CGAL::FPU_set_cw(CGAL_FE_TONEAREST);
+  // Enforce IEEE double precision and to nearest before using modular arithmetic
+  CGAL::Protect_FPU_rounding<true> pfr2(CGAL_FE_TONEAREST);
 
   typedef CGAL::Polynomial<CGAL::Residue>  MPolynomial_1;
   typedef CGAL::Polynomial<MPolynomial_1>  MPolynomial_2;