diff --git a/test/algorithms/test_length.hpp b/test/algorithms/test_length.hpp
index 713479d76..485c38056 100644
--- a/test/algorithms/test_length.hpp
+++ b/test/algorithms/test_length.hpp
@@ -44,7 +44,9 @@ void test_geometry(std::string const& wkt, double expected_length)
     Geometry geometry;
     bg::read_wkt(wkt, geometry);
     test_length(geometry, expected_length);
+#if !defined(GEOMETRY_TEST_DEBUG)
     test_length(boost::variant<Geometry>(geometry), expected_length);
+#endif
 }
 
 template <typename Geometry>
diff --git a/test/algorithms/test_perimeter.hpp b/test/algorithms/test_perimeter.hpp
index 7680e9860..74f04648a 100644
--- a/test/algorithms/test_perimeter.hpp
+++ b/test/algorithms/test_perimeter.hpp
@@ -29,7 +29,7 @@ void test_perimeter(Geometry const& geometry, long double expected_perimeter)
     std::ostringstream out;
     out << typeid(typename bg::coordinate_type<Geometry>::type).name()
         << std::endl
-        << typeid(typename bg::perimeter_result<Geometry>::type).name()
+        << typeid(typename bg::default_length_result<Geometry>::type).name()
         << std::endl
         << "perimeter : " << bg::perimeter(geometry)
         << std::endl;
@@ -48,7 +48,9 @@ void test_geometry(std::string const& wkt, double expected_perimeter)
     boost::variant<Geometry> v(geometry);
 
     test_perimeter(geometry, expected_perimeter);
+#if !defined(GEOMETRY_TEST_DEBUG)
     test_perimeter(v, expected_perimeter);
+#endif
 }
 
 template <typename Geometry>