diff --git a/test/algorithms/overlay/traverse.cpp b/test/algorithms/overlay/traverse.cpp
index 8f5225091..0367c6716 100644
--- a/test/algorithms/overlay/traverse.cpp
+++ b/test/algorithms/overlay/traverse.cpp
@@ -30,7 +30,6 @@
 // #define BOOST_GEOMETRY_DEBUG_ENRICH
 //#define BOOST_GEOMETRY_DEBUG_RELATIVE_ORDER
 
-// #define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
 // #define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
 
 
diff --git a/test/robustness/convex_hull/random_multi_points.cpp b/test/robustness/convex_hull/random_multi_points.cpp
index 93662ca9d..19b75c150 100644
--- a/test/robustness/convex_hull/random_multi_points.cpp
+++ b/test/robustness/convex_hull/random_multi_points.cpp
@@ -7,7 +7,6 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
 #define BOOST_GEOMETRY_NO_BOOST_TEST
 
 #include <sstream>
diff --git a/test/robustness/overlay/areal_areal/interior_triangles.cpp b/test/robustness/overlay/areal_areal/interior_triangles.cpp
index baf945dd9..e66d5ecae 100644
--- a/test/robustness/overlay/areal_areal/interior_triangles.cpp
+++ b/test/robustness/overlay/areal_areal/interior_triangles.cpp
@@ -13,9 +13,7 @@
 #include <iomanip>
 #include <string>
 
-#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
 #define BOOST_GEOMETRY_NO_BOOST_TEST
-#define BOOST_GEOMETRY_TIME_OVERLAY
 
 #include <test_overlay_p_q.hpp>
 
@@ -92,6 +90,7 @@ void test_all(int count, int count_x, int count_y, int offset, p_q_settings cons
 
 int main(int argc, char** argv)
 {
+    BoostGeometryWriteTestConfiguration();
     try
     {
         namespace po = boost::program_options;
diff --git a/test/robustness/overlay/areal_areal/intersection_pies.cpp b/test/robustness/overlay/areal_areal/intersection_pies.cpp
index dce301c12..201f68db8 100644
--- a/test/robustness/overlay/areal_areal/intersection_pies.cpp
+++ b/test/robustness/overlay/areal_areal/intersection_pies.cpp
@@ -7,8 +7,6 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-
-#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
 #define BOOST_GEOMETRY_NO_BOOST_TEST
 
 #include <test_overlay_p_q.hpp>
@@ -238,6 +236,7 @@ void test_all(bool multi, bool single_selftangent, p_q_settings const& settings)
 
 int main(int argc, char** argv)
 {
+    BoostGeometryWriteTestConfiguration();
     try
     {
         namespace po = boost::program_options;
diff --git a/test/robustness/overlay/areal_areal/intersection_stars.cpp b/test/robustness/overlay/areal_areal/intersection_stars.cpp
index 0592e2af3..6c4292662 100644
--- a/test/robustness/overlay/areal_areal/intersection_stars.cpp
+++ b/test/robustness/overlay/areal_areal/intersection_stars.cpp
@@ -12,7 +12,6 @@
 
 #define BOOST_GEOMETRY_NO_BOOST_TEST
 
-
 #include <test_overlay_p_q.hpp>
 
 #include <boost/program_options.hpp>
@@ -128,6 +127,7 @@ void test_all(std::string const& type, int count, int min_points, int max_points
 
 int main(int argc, char** argv)
 {
+    BoostGeometryWriteTestConfiguration();
     try
     {
         namespace po = boost::program_options;
diff --git a/test/robustness/overlay/areal_areal/intersects.cpp b/test/robustness/overlay/areal_areal/intersects.cpp
index 6ad26d22a..d844f4c60 100644
--- a/test/robustness/overlay/areal_areal/intersects.cpp
+++ b/test/robustness/overlay/areal_areal/intersects.cpp
@@ -13,9 +13,7 @@
 #include <iomanip>
 #include <string>
 
-#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
 #define BOOST_GEOMETRY_NO_BOOST_TEST
-//#define BOOST_GEOMETRY_TIME_OVERLAY
 
 #include <test_overlay_p_q.hpp>
 
@@ -104,6 +102,7 @@ void test_all(int count, int count_x, int count_y, int width_x, p_q_settings con
 
 int main(int argc, char** argv)
 {
+    BoostGeometryWriteTestConfiguration();
     try
     {
         namespace po = boost::program_options;
diff --git a/test/robustness/overlay/areal_areal/random_ellipses_stars.cpp b/test/robustness/overlay/areal_areal/random_ellipses_stars.cpp
index f5b930e55..a3d0455fc 100644
--- a/test/robustness/overlay/areal_areal/random_ellipses_stars.cpp
+++ b/test/robustness/overlay/areal_areal/random_ellipses_stars.cpp
@@ -7,7 +7,6 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
 #define BOOST_GEOMETRY_NO_BOOST_TEST
 
 
@@ -187,6 +186,7 @@ void test_all(std::string const& type, int seed, int count, p_q_settings setting
 
 int main(int argc, char** argv)
 {
+    BoostGeometryWriteTestConfiguration();
     try
     {
         namespace po = boost::program_options;
diff --git a/test/robustness/overlay/areal_areal/recursive_polygons.cpp b/test/robustness/overlay/areal_areal/recursive_polygons.cpp
index 9baf4248b..0a6eabbe7 100644
--- a/test/robustness/overlay/areal_areal/recursive_polygons.cpp
+++ b/test/robustness/overlay/areal_areal/recursive_polygons.cpp
@@ -7,7 +7,6 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
 #define BOOST_GEOMETRY_NO_BOOST_TEST
 
 #include <test_overlay_p_q.hpp>
@@ -141,6 +140,7 @@ void test_all(int seed, int count, int field_size, int level, bool triangular, p
 
 int main(int argc, char** argv)
 {
+    BoostGeometryWriteTestConfiguration();
     try
     {
         namespace po = boost::program_options;
diff --git a/test/robustness/overlay/areal_areal/star_comb.cpp b/test/robustness/overlay/areal_areal/star_comb.cpp
index 40bec4052..90edd4268 100644
--- a/test/robustness/overlay/areal_areal/star_comb.cpp
+++ b/test/robustness/overlay/areal_areal/star_comb.cpp
@@ -7,11 +7,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-
-// #define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
 #define BOOST_GEOMETRY_NO_BOOST_TEST
-// #define BOOST_GEOMETRY_TIME_OVERLAY
-
 
 #include <test_overlay_p_q.hpp>
 
@@ -71,6 +67,7 @@ void test_all(int count, int star_point_count, int comb_comb_count, double facto
 
 int main(int argc, char** argv)
 {
+    BoostGeometryWriteTestConfiguration();
     try
     {
         namespace po = boost::program_options;
diff --git a/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp b/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp
index fb11d13ce..952f81d95 100644
--- a/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp
+++ b/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp
@@ -12,6 +12,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#define BOOST_GEOMETRY_NO_BOOST_TEST
+
 #if defined(_MSC_VER)
 #  pragma warning( disable : 4244 )
 #  pragma warning( disable : 4267 )
@@ -36,6 +38,7 @@
 
 #include <boost/geometry/strategies/buffer.hpp>
 
+#include <geometry_test_common.hpp>
 #include <common/common_settings.hpp>
 #include <common/make_square_polygon.hpp>
 
@@ -285,6 +288,7 @@ void test_all(int seed, int count, int level, Settings const& settings)
 
 int main(int argc, char** argv)
 {
+    BoostGeometryWriteTestConfiguration();
     try
     {
         namespace po = boost::program_options;