diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_copy_test.cpp b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_copy_test.cpp
index 48b73b9ce05..3c5f12060a8 100644
--- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_copy_test.cpp
+++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_copy_test.cpp
@@ -69,7 +69,8 @@ struct Map_3_dart_max_items_3
 
 struct MonInfo
 {
-  MonInfo(int i=0) : mnb(i==0?rand():i), ptr(reinterpret_cast<char*>(this))
+  MonInfo(long long int i=0) : mnb(i==0?rand():i),
+                               ptr(reinterpret_cast<char*>(this))
   {}
   int mnb;
   std::string s;
@@ -157,7 +158,7 @@ struct CreateAttributes
 {
   static void run(Map& map)
   {
-    int nb=0;
+    long long int nb=0;
     for(typename Map::Dart_range::iterator it=map.darts().begin(),
         itend=map.darts().end(); it!=itend; ++it)
     {
@@ -181,7 +182,7 @@ struct InitDartInfo
 {
   static void run(Map& map)
   {
-    long int nb=0;
+    long long int nb=0;
     for(typename Map::Dart_range::iterator it=map.darts().begin(),
         itend=map.darts().end(); it!=itend; ++it)
     {
diff --git a/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_copy_test.cpp b/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_copy_test.cpp
index 69f3eb94ed7..aff5694f06e 100644
--- a/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_copy_test.cpp
+++ b/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_copy_test.cpp
@@ -91,7 +91,8 @@ public:
 
 struct MonInfo
 {
-  MonInfo(int i=0) : mnb(i==0?rand():i), ptr(reinterpret_cast<char*>(this))
+  MonInfo(long long int i=0) : mnb(i==0?rand():i),
+                               ptr(reinterpret_cast<char*>(this))
   {}
   int mnb;
   std::string s;
@@ -275,7 +276,7 @@ struct SetInfoIfNonVoid
 {
   static void run(Map& map,
                   typename Map::template Attribute_handle<i>::type attr,
-                  long int nb)
+                  long long int nb)
   {
     map.template info_of_attribute<i>(attr)=nb;
   }
@@ -284,7 +285,7 @@ template<typename Map, int i>
 struct SetInfoIfNonVoid<Map, i, void>
 {
   static void run(Map&, typename Map::template Attribute_handle<i>::type,
-                  long int)
+                  long long int)
   {}
 };
 
@@ -294,7 +295,7 @@ struct CreateAttributes
 {
   static void run(Map& map)
   {
-    int nb=0;
+    long long int nb=0;
     for(typename Map::Dart_range::iterator it=map.darts().begin(),
         itend=map.darts().end(); it!=itend; ++it)
     {
@@ -312,7 +313,7 @@ struct CreateAttributes<Map, 0, Attr>
 {
   static void run(Map& amap)
   {
-    int nb=0;
+    long long int nb=0;
     for ( typename Map::template Attribute_range<0>::type::iterator
           it=amap.template attributes<0>().begin(),
           itend=amap.template attributes<0>().end(); it!=itend; ++it )
@@ -339,7 +340,7 @@ struct InitDartInfo
 {
   static void run(Map& map)
   {
-    long int nb=0;
+    long long int nb=0;
     for(typename Map::Dart_range::iterator it=map.darts().begin(),
         itend=map.darts().end(); it!=itend; ++it)
     {