diff --git a/Mesh_2/test/Mesh_2/test_double_map.cpp b/Mesh_2/test/Mesh_2/test_double_map.cpp
index 5e255d61b2b..7ef6a121834 100644
--- a/Mesh_2/test/Mesh_2/test_double_map.cpp
+++ b/Mesh_2/test/Mesh_2/test_double_map.cpp
@@ -70,7 +70,7 @@ int main(int argc, char** argv)
   std::cerr << "Assignment f2=f...\n";
   f2 = f; // check the assignment
   std::cerr << "Auto-assignment f=f...\n";
-  f2 = (Map&)f2; // check the auto-assignment
+  f2 = const_cast<Map&>(f2); // check the auto-assignment
   std::cerr << "Copy-construction...\n";
   Map f3(f); // check the copy constructor
 
diff --git a/Mesh_3/test/Mesh_3/test_c3t3_io.cpp b/Mesh_3/test/Mesh_3/test_c3t3_io.cpp
index 5e75b344e14..a937d691868 100644
--- a/Mesh_3/test/Mesh_3/test_c3t3_io.cpp
+++ b/Mesh_3/test/Mesh_3/test_c3t3_io.cpp
@@ -86,9 +86,9 @@ public:
   //! perform the output, calls \c operator\<\< by default.
   std::ostream& operator()( std::ostream& out) const {
     if(IO::is_ascii(out)) {
-      out << (int)t;
+      out << static_cast<int>(t);
     } else {
-      CGAL::write(out, (int)t);
+      CGAL::write(out, static_cast<int>(t));
     }
     return out;
   }
@@ -109,7 +109,7 @@ public:
     } else {
       CGAL::read(in, i);
     }
-    t = (T)i;
+    t = static_cast<T>(i);
     return in;
   }
 };