diff --git a/test/algorithms/buffer/buffer_multi_point.cpp b/test/algorithms/buffer/buffer_multi_point.cpp
index 1380151f3..1a38dd874 100644
--- a/test/algorithms/buffer/buffer_multi_point.cpp
+++ b/test/algorithms/buffer/buffer_multi_point.cpp
@@ -91,7 +91,7 @@ void test_all()
             distance_strategy(1),
             side_strategy,
             bg::strategy::buffer::point_circle(36),
-            1, 0, 3.12566719800474635, ut_settings(1.0));
+            1, 0, 3.12566719800474635, ut_settings(1.0), NULL);
     }
 }
 
diff --git a/test/algorithms/buffer/test_buffer.hpp b/test/algorithms/buffer/test_buffer.hpp
index ba2b1b959..627294946 100644
--- a/test/algorithms/buffer/test_buffer.hpp
+++ b/test/algorithms/buffer/test_buffer.hpp
@@ -98,13 +98,13 @@ template<> struct EndTestProperties<boost::geometry::strategy::buffer::end_flat>
 struct ut_settings
 {
     double tolerance;
-    bool check_self_intersections;
     bool test_validity;
+    bool check_self_intersections;
 
     explicit ut_settings(double tol = 0.01, bool val = true, bool self = true)
         : tolerance(tol)
-        , check_self_intersections(self)
         , test_validity(val)
+        , check_self_intersections(self)
     {}
 
     static inline ut_settings ignore_validity()
@@ -158,8 +158,8 @@ void test_buffer(std::string const& caseid, Geometry const& geometry,
             int expected_count,
             int expected_holes_count,
             double expected_area,
-            ut_settings const& settings = ut_settings(),
-            std::size_t* self_ip_count = NULL)
+            ut_settings const& settings,
+            std::size_t* self_ip_count)
 {
     namespace bg = boost::geometry;
 
@@ -590,6 +590,4 @@ void test_with_custom_strategies(std::string const& caseid,
             expected_area, settings, NULL);
 }
 
-
-
 #endif