diff --git a/Min_ellipse_2/include/CGAL/Min_ellipse_2.h b/Min_ellipse_2/include/CGAL/Min_ellipse_2.h
index 6e5e9e41897..4e3712c70a4 100644
--- a/Min_ellipse_2/include/CGAL/Min_ellipse_2.h
+++ b/Min_ellipse_2/include/CGAL/Min_ellipse_2.h
@@ -204,7 +204,7 @@ class Min_ellipse_2 {
     // random access for support points
     inline
     const Point&
-    support_point( int i) const
+    support_point( std::size_t i) const
     {
         CGAL_optimisation_precondition( (i >= 0) &&
                                         (i <  number_of_support_points()));
diff --git a/Min_ellipse_2/test/Min_ellipse_2/test_Min_ellipse_2.cpp b/Min_ellipse_2/test/Min_ellipse_2/test_Min_ellipse_2.cpp
index 5245e68f1a2..db88600fa5d 100644
--- a/Min_ellipse_2/test/Min_ellipse_2/test_Min_ellipse_2.cpp
+++ b/Min_ellipse_2/test/Min_ellipse_2/test_Min_ellipse_2.cpp
@@ -234,7 +234,7 @@ cover_Min_ellipse_2( bool verbose, const Traits&, const RT&)
     const int     n = 20;
     CGAL::Random  random_x, random_y;
     Point         random_points[ n];
-    int           i;
+    std::size_t   i;
     verr << endl <<  n  << " random points from [0,128)^2:" << endl;
     for ( i = 0; i < n; ++i) {
         random_points[ i] = Point( RT( random_x( 128)),