diff --git a/AABB_tree/test/AABB_tree/AABB_test_util.h b/AABB_tree/test/AABB_tree/AABB_test_util.h
index 16d143479c3..629937053f0 100644
--- a/AABB_tree/test/AABB_tree/AABB_test_util.h
+++ b/AABB_tree/test/AABB_tree/AABB_test_util.h
@@ -147,7 +147,8 @@ void test_all_distance_query_types(Tree& tree)
 
 
 template <class Tree, class K>
-void test_distance_speed(Tree& tree)
+void test_distance_speed(Tree& tree,
+                         const double duration)
 {
     typedef typename K::FT FT;
     typedef typename K::Ray_3 Ray;
@@ -157,7 +158,7 @@ void test_distance_speed(Tree& tree)
     CGAL::Timer timer;
     timer.start();
     unsigned int nb = 0;
-    while(timer.time() < 1.0)
+    while(timer.time() < duration)
     {
             // picks a random point in the tree bbox
             Point query = random_point_in<K>(tree.bbox());
@@ -220,7 +221,7 @@ struct Primitive_generator<TRIANGLE, K, Polyhedron>
  * Declaration only, implementation should be given in .cpp file
  */
 template<class K, class Tree, class Polyhedron>
-void test_impl(Tree& tree, Polyhedron& p);
+void test_impl(Tree& tree, Polyhedron& p, const double duration);
 
 
 /**
diff --git a/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp b/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
index ec9adea5d26..46f7e63bf88 100644
--- a/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
@@ -41,18 +41,19 @@
 
 
 template<class K, class Tree, class Polyhedron>
-void test_impl(Tree& tree, Polyhedron&)
+void test_impl(Tree& tree, Polyhedron&, const double duration)
 {
-  test_distance_speed<Tree,K>(tree);
+  test_distance_speed<Tree,K>(tree,duration);
   test_all_distance_query_types<Tree,K>(tree);
 }
 
 int main(void)
 {
   std::cout << "AABB distance tests" << std::endl;
-  test_kernels<SEGMENT>("./data/cube.off");
-  test_kernels<SEGMENT>("./data/coverrear.off");
-  test_kernels<SEGMENT>("./data/nested_spheres.off");
-  test_kernels<SEGMENT>("./data/finger.off");
+  const double duration = 0.2;
+  test_kernels<SEGMENT>("./data/cube.off",duration);
+  test_kernels<SEGMENT>("./data/coverrear.off",duration);
+  test_kernels<SEGMENT>("./data/nested_spheres.off",duration);
+  test_kernels<SEGMENT>("./data/finger.off",duration);
   return 0;
 }
diff --git a/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
index 4a20b32371f..dfeb7dae9b3 100644
--- a/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
@@ -38,18 +38,19 @@
 
 
 template<class K, class Tree, class Polyhedron>
-void test_impl(Tree& tree, Polyhedron&)
+void test_impl(Tree& tree, Polyhedron&,const double duration)
 {
-  test_distance_speed<Tree,K>(tree);
+  test_distance_speed<Tree,K>(tree,duration);
   test_all_distance_query_types<Tree,K>(tree);
 }
 
 int main(void)
 {
   std::cout << "AABB distance tests" << std::endl;
-  test_kernels<TRIANGLE>("./data/cube.off");
-  test_kernels<TRIANGLE>("./data/coverrear.off");
-  test_kernels<TRIANGLE>("./data/nested_spheres.off");
-  test_kernels<TRIANGLE>("./data/finger.off");
+  const double duration = 0.2;
+  test_kernels<TRIANGLE>("./data/cube.off",duration);
+  test_kernels<TRIANGLE>("./data/coverrear.off",duration);
+  test_kernels<TRIANGLE>("./data/nested_spheres.off",duration);
+  test_kernels<TRIANGLE>("./data/finger.off",duration);
   return 0;
 }
diff --git a/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp
index 94a0f0327c5..46c053e1238 100644
--- a/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp
@@ -135,7 +135,7 @@ int main()
           if(filename.find(".off") != std::string::npos)
           {
             test_kernels<TRIANGLE>(filename.data(),duration);
-            std::cout << filename; // dir.leaf()
+            std::cout << filename; 
           }
       }