diff --git a/Envelope_2/test/Envelope_2/test_envelope_segments.cpp b/Envelope_2/test/Envelope_2/test_envelope_segments.cpp
index db3eb41389f..fb1ea263ff5 100644
--- a/Envelope_2/test/Envelope_2/test_envelope_segments.cpp
+++ b/Envelope_2/test/Envelope_2/test_envelope_segments.cpp
@@ -1,16 +1,4 @@
-#include <CGAL/basic.h>
-
-#ifdef CGAL_USE_GMP
-  // GMP is installed. Use the GMP rational number-type. 
-  #include <CGAL/Gmpq.h>
-  typedef CGAL::Gmpq                                    NT;
-#else
-  // GMP is not installed. Use CGAL's exact rational number-type.
-  #include <CGAL/MP_Float.h>
-  #include <CGAL/Quotient.h>
-  typedef CGAL::Quotient<CGAL::MP_Float>                NT;
-#endif
-
+#include <CGAL/Arithmetic_kernel.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/Arr_segment_traits_2.h>
 #include <CGAL/Arr_curve_data_traits_2.h>
@@ -23,7 +11,8 @@
 
 using std::strcmp;
 
-typedef CGAL::Gmpq                                      NT;
+// leda_rational, or Gmpq, or Quotient<MP_float>
+typedef CGAL::Arithmetic_kernel::Rational               NT;
 typedef CGAL::Cartesian<NT>                             Kernel;
 typedef CGAL::Arr_segment_traits_2<Kernel>              Segment_traits_2;
 typedef CGAL::Arr_curve_data_traits_2<Segment_traits_2, 
diff --git a/Envelope_3/test/Envelope_3/triangles_test.cpp b/Envelope_3/test/Envelope_3/triangles_test.cpp
index dbf71da40e7..71c61e1a9dd 100644
--- a/Envelope_3/test/Envelope_3/triangles_test.cpp
+++ b/Envelope_3/test/Envelope_3/triangles_test.cpp
@@ -1,6 +1,5 @@
-
+#include <CGAL/Arithmetic_kernel.h>
 #include <CGAL/Cartesian.h>
-#include <CGAL/Gmpq.h>
 #include <CGAL/Timer.h>
 
 #include <CGAL/Env_triangle_traits_3.h>
@@ -14,7 +13,8 @@
 #include <vector>
 #include <map>
 
-typedef CGAL::Gmpq                                               NT;
+// leda_rational, or Gmpq, or Quotient<MP_float>
+typedef CGAL::Arithmetic_kernel::Rational                        NT;
 typedef CGAL::Cartesian<NT>                                      Kernel;
 
 typedef Kernel::Point_3                                          Point_3;