diff --git a/test/core/Jamfile b/test/core/Jamfile
index 958ba324b..a05b4ac32 100644
--- a/test/core/Jamfile
+++ b/test/core/Jamfile
@@ -18,6 +18,8 @@ project
 alias headers_concepts : [ generate_self_contained_headers concepts ] ;
 alias headers : [ generate_self_contained_headers : concepts extension io ] ;
 
+run promote_integral.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
+
 build-project point ;
 build-project channel ;
 build-project color ;
@@ -29,5 +31,3 @@ build-project image ;
 build-project image_view ;
 build-project algorithm ;
 build-project image_processing ;
-
-run promote_integral.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
diff --git a/test/core/channel/Jamfile b/test/core/channel/Jamfile
index 4305cefea..63de800b2 100644
--- a/test/core/channel/Jamfile
+++ b/test/core/channel/Jamfile
@@ -8,21 +8,16 @@
 
 import testing ;
 
-project
-    : requirements
-    <include>..
-    <library>/boost/test//boost_unit_test_framework
-    <link>shared:<define>BOOST_TEST_DYN_LINK=1
-    ;
+compile is_channel_integral.cpp ;
 
-compile concepts.cpp ;
-run test_fixture.cpp ;
-run is_channel_integral.cpp ;
-run channel_traits.cpp ;
-run packed_channel_value.cpp ;
-run scoped_channel_value.cpp ;
-run algorithm_channel_arithmetic.cpp ;
-run algorithm_channel_convert.cpp ;
-run algorithm_channel_invert.cpp ;
-run algorithm_channel_multiply.cpp ;
-run algorithm_channel_relation.cpp ;
+run concepts.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
+run channel_traits.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
+run test_fixture.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
+run packed_channel_value.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
+run scoped_channel_value.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
+
+run algorithm_channel_arithmetic.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
+run algorithm_channel_convert.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
+run algorithm_channel_invert.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
+run algorithm_channel_multiply.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
+run algorithm_channel_relation.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
diff --git a/test/core/channel/algorithm_channel_arithmetic.cpp b/test/core/channel/algorithm_channel_arithmetic.cpp
index 5eaecddf1..49dda8f9b 100644
--- a/test/core/channel/algorithm_channel_arithmetic.cpp
+++ b/test/core/channel/algorithm_channel_arithmetic.cpp
@@ -6,12 +6,14 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/channel/algorithm_channel_arithmetic
+#include "unit_test.hpp"
+
 #include <boost/gil/channel_algorithm.hpp>
+
 #include <type_traits>
 #include <utility>
 
-#define BOOST_TEST_MODULE test_algorithm_channel_arithmetic
-#include "unit_test.hpp"
 #include "test_fixture.hpp"
 
 namespace gil = boost::gil;
diff --git a/test/core/channel/algorithm_channel_convert.cpp b/test/core/channel/algorithm_channel_convert.cpp
index 502ae2b88..1e7d77924 100644
--- a/test/core/channel/algorithm_channel_convert.cpp
+++ b/test/core/channel/algorithm_channel_convert.cpp
@@ -6,11 +6,13 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/channel/algorithm_channel_convert
+#include "unit_test.hpp"
+
 #include <boost/gil/channel_algorithm.hpp>
+
 #include <cstdint>
 
-#define BOOST_TEST_MODULE test_algorithm_channel_convert
-#include "unit_test.hpp"
 #include "test_fixture.hpp"
 
 namespace gil = boost::gil;
diff --git a/test/core/channel/algorithm_channel_invert.cpp b/test/core/channel/algorithm_channel_invert.cpp
index 2920f78a5..61765b897 100644
--- a/test/core/channel/algorithm_channel_invert.cpp
+++ b/test/core/channel/algorithm_channel_invert.cpp
@@ -6,10 +6,11 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/channel/algorithm_channel_invert
+#include "unit_test.hpp"
+
 #include <boost/gil/channel_algorithm.hpp>
 
-#define BOOST_TEST_MODULE test_algorithm_channel_invert
-#include "unit_test.hpp"
 #include "test_fixture.hpp"
 
 namespace gil = boost::gil;
diff --git a/test/core/channel/algorithm_channel_multiply.cpp b/test/core/channel/algorithm_channel_multiply.cpp
index 91628f706..f0c14b31e 100644
--- a/test/core/channel/algorithm_channel_multiply.cpp
+++ b/test/core/channel/algorithm_channel_multiply.cpp
@@ -6,10 +6,11 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/channel/algorithm_channel_multiply
+#include "unit_test.hpp"
+
 #include <boost/gil/channel_algorithm.hpp>
 
-#define BOOST_TEST_MODULE test_algorithm_channel_multiply
-#include "unit_test.hpp"
 #include "test_fixture.hpp"
 
 namespace gil = boost::gil;
diff --git a/test/core/channel/algorithm_channel_relation.cpp b/test/core/channel/algorithm_channel_relation.cpp
index be3bd2d3e..cceda8f7c 100644
--- a/test/core/channel/algorithm_channel_relation.cpp
+++ b/test/core/channel/algorithm_channel_relation.cpp
@@ -6,10 +6,11 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/channel/algorithm_channel_relation
+#include "unit_test.hpp"
+
 #include <boost/gil/channel_algorithm.hpp>
 
-#define BOOST_TEST_MODULE test_algorithm_channel_relation
-#include "unit_test.hpp"
 #include "test_fixture.hpp"
 
 namespace gil = boost::gil;
diff --git a/test/core/channel/channel_traits.cpp b/test/core/channel/channel_traits.cpp
index f8fccdfd4..36073a173 100644
--- a/test/core/channel/channel_traits.cpp
+++ b/test/core/channel/channel_traits.cpp
@@ -5,14 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/channel/channel_traits
+#include "unit_test.hpp"
+
 #include <boost/gil/channel.hpp>
 #include <boost/gil/typedefs.hpp>
+
 #include <cstdint>
 #include <limits>
 
-#define BOOST_TEST_MODULE test_channel_traits
-#include "unit_test.hpp"
-
 namespace gil = boost::gil;
 
 template <typename T>
diff --git a/test/core/channel/concepts.cpp b/test/core/channel/concepts.cpp
index 02c8e2db3..37ad28005 100644
--- a/test/core/channel/concepts.cpp
+++ b/test/core/channel/concepts.cpp
@@ -6,7 +6,8 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#include <boost/config.hpp>
+#define BOOST_TEST_MODULE gil/test/core/channel/concepts
+#include "unit_test.hpp"
 
 #if defined(BOOST_CLANG)
 #pragma clang diagnostic push
@@ -19,10 +20,9 @@
 #endif
 
 #include <boost/gil/concepts.hpp>
+
 #include <cstdint>
 
-#define BOOST_TEST_MODULE test_channel_concepts
-#include "unit_test.hpp"
 #include "test_fixture.hpp"
 
 namespace gil = boost::gil;
diff --git a/test/core/channel/packed_channel_value.cpp b/test/core/channel/packed_channel_value.cpp
index 7099a07fd..90ab00fe3 100644
--- a/test/core/channel/packed_channel_value.cpp
+++ b/test/core/channel/packed_channel_value.cpp
@@ -5,16 +5,16 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/channel/packed_channel_value
+#include "unit_test.hpp"
+
 #include <boost/gil/channel.hpp>
 #include <boost/gil/typedefs.hpp>
+
 #include <cstdint>
 #include <limits>
 #include <type_traits>
 
-
-#define BOOST_TEST_MODULE test_channel_traits
-#include "unit_test.hpp"
-
 namespace gil = boost::gil;
 
 template <typename T>
diff --git a/test/core/channel/scoped_channel_value.cpp b/test/core/channel/scoped_channel_value.cpp
index 3cfd47d08..0ab38cd40 100644
--- a/test/core/channel/scoped_channel_value.cpp
+++ b/test/core/channel/scoped_channel_value.cpp
@@ -6,15 +6,16 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/channel/scoped_channel_value
+#include "unit_test.hpp"
+
 #include <boost/gil/channel.hpp>
 #include <boost/gil/channel_algorithm.hpp>
 #include <boost/gil/typedefs.hpp>
+
 #include <cstdint>
 #include <limits>
 
-#define BOOST_TEST_MODULE test_scoped_channel_value
-#include "unit_test.hpp"
-
 namespace gil = boost::gil;
 
 struct int_minus_value  { static std::int8_t apply() { return -64; } };
diff --git a/test/core/channel/test_fixture.cpp b/test/core/channel/test_fixture.cpp
index ea8824005..0767887f1 100644
--- a/test/core/channel/test_fixture.cpp
+++ b/test/core/channel/test_fixture.cpp
@@ -5,12 +5,12 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#include <limits>
-
-#define BOOST_TEST_MODULE test_channel_test_fixture
+#define BOOST_TEST_MODULE gil/test/core/channel/test_fixture
 #include "unit_test.hpp"
 #include "test_fixture.hpp"
 
+#include <limits>
+
 namespace fixture = boost::gil::test::fixture;
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(channel_minmax_value_integral, Channel, fixture::channel_integer_types)
diff --git a/test/core/color/Jamfile b/test/core/color/Jamfile
index 504ff377a..6a8581ef7 100644
--- a/test/core/color/Jamfile
+++ b/test/core/color/Jamfile
@@ -8,10 +8,5 @@
 
 import testing ;
 
-project
-    : requirements
-    <include>..
-    ;
-
 compile concepts.cpp ;
 compile color_spaces_are_compatible.cpp ;
diff --git a/test/core/color_base/Jamfile b/test/core/color_base/Jamfile
index aef29b107..b11f5a056 100644
--- a/test/core/color_base/Jamfile
+++ b/test/core/color_base/Jamfile
@@ -8,12 +8,9 @@
 
 import testing ;
 
-project
-    : requirements
-    <include>..
-    ;
-
 compile concepts.cpp ;
-compile homogeneous_color_base.cpp ;
 compile-fail static_transform_gray_to_rgb_fail.cpp ;
 compile-fail static_transform_rgb_to_cmyk_fail.cpp ;
+
+run homogeneous_color_base.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
+run static_transform.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
diff --git a/test/core/color_base/homogeneous_color_base.cpp b/test/core/color_base/homogeneous_color_base.cpp
index fb71bb61e..399911d60 100644
--- a/test/core/color_base/homogeneous_color_base.cpp
+++ b/test/core/color_base/homogeneous_color_base.cpp
@@ -5,6 +5,9 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/color_base/homogeneous_color_base
+#include "unit_test.hpp"
+
 #include <boost/gil/color_base.hpp>
 #include <boost/gil/gray.hpp>
 #include <boost/gil/rgb.hpp>
@@ -14,9 +17,6 @@
 
 #include <type_traits>
 
-#define BOOST_TEST_MODULE test_channel_traits
-#include "unit_test.hpp"
-
 namespace gil = boost::gil;
 
 namespace {
diff --git a/test/core/color_base/static_transform.cpp b/test/core/color_base/static_transform.cpp
index 9317bed46..445387f8d 100644
--- a/test/core/color_base/static_transform.cpp
+++ b/test/core/color_base/static_transform.cpp
@@ -5,15 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/color_base/homogeneous_color_base
+#include "unit_test.hpp"
+
 #include <boost/gil/color_base.hpp>
 #include <boost/gil/pixel.hpp>
 #include <boost/gil/typedefs.hpp>
 
 #include <type_traits>
 
-#define BOOST_TEST_MODULE test_color_base_static_transform
-#include "unit_test.hpp"
-
 namespace gil = boost::gil;
 
 BOOST_AUTO_TEST_CASE(single_source_gray8_to_gray8)
diff --git a/test/core/image/Jamfile b/test/core/image/Jamfile
index ad2b4421b..8f5c0bf62 100644
--- a/test/core/image/Jamfile
+++ b/test/core/image/Jamfile
@@ -8,11 +8,6 @@
 
 import testing ;
 
-project
-    : requirements
-    <include>..
-    ;
-
 compile concepts.cpp ;
 
 run test_fixture.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
diff --git a/test/core/image/test_fixture.cpp b/test/core/image/test_fixture.cpp
index 5e2a82304..07a0fe785 100644
--- a/test/core/image/test_fixture.cpp
+++ b/test/core/image/test_fixture.cpp
@@ -5,8 +5,8 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#include <boost/config.hpp>
-#include <boost/core/ignore_unused.hpp>
+#define BOOST_TEST_MODULE gil/test/core/image/test_fixture
+#include "unit_test.hpp"
 
 #if defined(BOOST_CLANG)
 #pragma clang diagnostic push
@@ -26,8 +26,6 @@
 #include <cstdint>
 #include <vector>
 
-#define BOOST_TEST_MODULE test_ext_numeric_test_fixture
-#include "unit_test.hpp"
 #include "test_fixture.hpp"
 
 namespace gil = boost::gil;
diff --git a/test/core/image_processing/Jamfile b/test/core/image_processing/Jamfile
index 9e9178434..8e3c09506 100644
--- a/test/core/image_processing/Jamfile
+++ b/test/core/image_processing/Jamfile
@@ -8,11 +8,6 @@
 #
 import testing ;
 
-project
-    : requirements
-    <include>..
-    ;
-
 compile-fail threshold_color_spaces_not_compatible_fail.cpp ;
 run threshold_binary.cpp ;
 run threshold_truncate.cpp ;
diff --git a/test/core/image_processing/box_filter.cpp b/test/core/image_processing/box_filter.cpp
index 9767a4803..b17358e4a 100644
--- a/test/core/image_processing/box_filter.cpp
+++ b/test/core/image_processing/box_filter.cpp
@@ -5,16 +5,14 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-
-#define BOOST_TEST_MODULE test_image_processing_box_filter
+#define BOOST_TEST_MODULE gil/test/core/image_processing/median_filter
 #include "unit_test.hpp"
 
-#include <boost/gil/image_view.hpp>
 #include <boost/gil/algorithm.hpp>
 #include <boost/gil/gray.hpp>
+#include <boost/gil/image_view.hpp>
 #include <boost/gil/image_processing/filter.hpp>
 
-
 namespace gil = boost::gil;
 
 std::uint8_t img[] =
diff --git a/test/core/image_processing/harris.cpp b/test/core/image_processing/harris.cpp
index acf205784..f8c8e7dc6 100644
--- a/test/core/image_processing/harris.cpp
+++ b/test/core/image_processing/harris.cpp
@@ -5,12 +5,13 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-#include <boost/core/lightweight_test.hpp>
 #include <boost/gil/image.hpp>
 #include <boost/gil/image_view.hpp>
 #include <boost/gil/image_processing/numeric.hpp>
 #include <boost/gil/image_processing/harris.hpp>
 
+#include <boost/core/lightweight_test.hpp>
+
 namespace gil = boost::gil;
 
 bool are_equal(gil::gray32f_view_t expected, gil::gray32f_view_t actual) {
diff --git a/test/core/image_processing/hessian.cpp b/test/core/image_processing/hessian.cpp
index 150be935f..b8e797d55 100644
--- a/test/core/image_processing/hessian.cpp
+++ b/test/core/image_processing/hessian.cpp
@@ -5,12 +5,13 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-#include <boost/core/lightweight_test.hpp>
 #include <boost/gil/image.hpp>
 #include <boost/gil/image_view.hpp>
 #include <boost/gil/image_processing/numeric.hpp>
 #include <boost/gil/image_processing/hessian.hpp>
 
+#include <boost/core/lightweight_test.hpp>
+
 namespace gil = boost::gil;
 
 bool are_equal(gil::gray32f_view_t expected, gil::gray32f_view_t actual) {
diff --git a/test/core/image_processing/lanczos_scaling.cpp b/test/core/image_processing/lanczos_scaling.cpp
index 34d07d6ec..818156f22 100755
--- a/test/core/image_processing/lanczos_scaling.cpp
+++ b/test/core/image_processing/lanczos_scaling.cpp
@@ -10,7 +10,6 @@
 
 #include <boost/core/lightweight_test.hpp>
 
-
 #include <iostream>
 
 namespace gil = boost::gil;
diff --git a/test/core/image_processing/median_filter.cpp b/test/core/image_processing/median_filter.cpp
index d57aac4e4..997239313 100644
--- a/test/core/image_processing/median_filter.cpp
+++ b/test/core/image_processing/median_filter.cpp
@@ -5,8 +5,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-
-#define BOOST_TEST_MODULE test_image_processing_median_filter
+#define BOOST_TEST_MODULE gil/test/core/image_processing/median_filter
 #include "unit_test.hpp"
 
 #include <boost/gil/image_view.hpp>
@@ -14,7 +13,6 @@
 #include <boost/gil/gray.hpp>
 #include <boost/gil/image_processing/filter.hpp>
 
-
 namespace gil = boost::gil;
 
 std::uint8_t img[] =
diff --git a/test/core/image_processing/simple_kernels.cpp b/test/core/image_processing/simple_kernels.cpp
index e9620b5da..9d4f638da 100644
--- a/test/core/image_processing/simple_kernels.cpp
+++ b/test/core/image_processing/simple_kernels.cpp
@@ -5,10 +5,11 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-#include <boost/gil/image_processing/numeric.hpp>
 #include <boost/gil/image.hpp>
+#include <boost/gil/image_processing/numeric.hpp>
 #include <boost/gil/image_view.hpp>
 #include <boost/gil/typedefs.hpp>
+
 #include <boost/core/lightweight_test.hpp>
 
 namespace gil = boost::gil;
diff --git a/test/core/image_processing/sobel_scharr.cpp b/test/core/image_processing/sobel_scharr.cpp
index 50ecf3c78..1c0fbbee2 100644
--- a/test/core/image_processing/sobel_scharr.cpp
+++ b/test/core/image_processing/sobel_scharr.cpp
@@ -1,5 +1,13 @@
-#include <boost/gil/image_processing/numeric.hpp>
+//
+// Copyright 2019 Olzhas Zhumabek <anonymous.from.applecity@gmail.com>
+//
+// Use, modification and distribution are subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
 #include <boost/gil/detail/math.hpp>
+#include <boost/gil/image_processing/numeric.hpp>
+
 #include <boost/core/lightweight_test.hpp>
 
 #include <algorithm>
diff --git a/test/core/image_processing/threshold_binary.cpp b/test/core/image_processing/threshold_binary.cpp
index 344fb1b74..098cfc062 100644
--- a/test/core/image_processing/threshold_binary.cpp
+++ b/test/core/image_processing/threshold_binary.cpp
@@ -5,12 +5,12 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-#include <boost/gil/image_processing/threshold.hpp>
-#include <boost/gil/image_view.hpp>
-#include <boost/gil/algorithm.hpp>
 #include <boost/gil/gray.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/gil/algorithm.hpp>
+#include <boost/gil/image_view.hpp>
+#include <boost/gil/image_processing/threshold.hpp>
 
+#include <boost/core/lightweight_test.hpp>
 
 namespace gil = boost::gil;
 
diff --git a/test/core/image_processing/threshold_otsu.cpp b/test/core/image_processing/threshold_otsu.cpp
index 179131d94..f1eaf849e 100644
--- a/test/core/image_processing/threshold_otsu.cpp
+++ b/test/core/image_processing/threshold_otsu.cpp
@@ -5,12 +5,12 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-#include <boost/gil/image_processing/threshold.hpp>
-#include <boost/gil/image_view.hpp>
 #include <boost/gil/algorithm.hpp>
 #include <boost/gil/gray.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/gil/image_view.hpp>
+#include <boost/gil/image_processing/threshold.hpp>
 
+#include <boost/core/lightweight_test.hpp>
 
 namespace gil = boost::gil;
 
diff --git a/test/core/image_processing/threshold_truncate.cpp b/test/core/image_processing/threshold_truncate.cpp
index 4549440c5..18266dec6 100644
--- a/test/core/image_processing/threshold_truncate.cpp
+++ b/test/core/image_processing/threshold_truncate.cpp
@@ -5,12 +5,12 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-#include <boost/gil/image_processing/threshold.hpp>
-#include <boost/gil/image_view.hpp>
 #include <boost/gil/algorithm.hpp>
 #include <boost/gil/gray.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/gil/image_view.hpp>
+#include <boost/gil/image_processing/threshold.hpp>
 
+#include <boost/core/lightweight_test.hpp>
 
 namespace gil = boost::gil;
 
diff --git a/test/core/image_view/Jamfile b/test/core/image_view/Jamfile
index 1dc8d7763..adbcf9214 100644
--- a/test/core/image_view/Jamfile
+++ b/test/core/image_view/Jamfile
@@ -8,11 +8,6 @@
 
 import testing ;
 
-project
-    : requirements
-    <include>..
-    ;
-
 compile concepts.cpp ;
 compile derived_view_type.cpp ;
 compile dynamic_step.cpp ;
diff --git a/test/core/image_view/subimage_view.cpp b/test/core/image_view/subimage_view.cpp
index a3d2f2a23..d933c78a4 100644
--- a/test/core/image_view/subimage_view.cpp
+++ b/test/core/image_view/subimage_view.cpp
@@ -5,12 +5,13 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/image_view/subimage_view
+#include "unit_test.hpp"
+
 #include <boost/gil.hpp>
 
-#define BOOST_TEST_MODULE test_image_view_subimage_view
-#include "unit_test.hpp"
-#include "unit_test_utility.hpp"
 #include "core/image/test_fixture.hpp"
+#include "unit_test_utility.hpp"
 
 namespace gil = boost::gil;
 namespace fixture = boost::gil::test::fixture;
diff --git a/test/core/iterator/Jamfile b/test/core/iterator/Jamfile
index 27cbe04de..8da365c86 100644
--- a/test/core/iterator/Jamfile
+++ b/test/core/iterator/Jamfile
@@ -8,11 +8,6 @@
 
 import testing ;
 
-project
-    : requirements
-    <include>..
-    ;
-
 compile concepts.cpp ;
 compile dynamic_step.cpp ;
 compile is_planar.cpp ;
diff --git a/test/core/locator/Jamfile b/test/core/locator/Jamfile
index aa393e7ca..54e8e5aeb 100644
--- a/test/core/locator/Jamfile
+++ b/test/core/locator/Jamfile
@@ -8,10 +8,5 @@
 
 import testing ;
 
-project
-    : requirements
-    <include>..
-    ;
-
 compile concepts.cpp ;
 compile dynamic_step.cpp ;
diff --git a/test/core/pixel/Jamfile b/test/core/pixel/Jamfile
index 9bf6cf311..5b88ebf9a 100644
--- a/test/core/pixel/Jamfile
+++ b/test/core/pixel/Jamfile
@@ -8,18 +8,13 @@
 
 import testing ;
 
-project
-    : requirements
-    <include>..
-    ;
-
 compile bit_aligned_pixel_reference.cpp ;
 compile concepts.cpp ;
 compile is_pixel.cpp ;
 compile is_planar.cpp ;
 compile num_channels.cpp ;
-compile packed_pixel.cpp ;
 compile pixel_reference_is_mutable.cpp ;
 compile pixels_are_compatible.cpp ;
 
+run packed_pixel.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
 run test_fixture.cpp /boost/test//boost_unit_test_framework : : : <link>shared:<define>BOOST_TEST_DYN_LINK=1 ;
diff --git a/test/core/pixel/packed_pixel.cpp b/test/core/pixel/packed_pixel.cpp
index e95c597ec..9e91232b4 100644
--- a/test/core/pixel/packed_pixel.cpp
+++ b/test/core/pixel/packed_pixel.cpp
@@ -5,17 +5,17 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/core/pixel/packed_pixel
+#include "unit_test.hpp"
+
 #include <boost/gil/channel.hpp>
-#include <boost/gil/packed_pixel.hpp>
 #include <boost/gil/gray.hpp>
+#include <boost/gil/packed_pixel.hpp>
 #include <boost/gil/rgb.hpp>
 
 #include <boost/core/typeinfo.hpp>
 #include <boost/mp11.hpp>
 
-#define BOOST_TEST_MODULE test_channel_traits
-#include "unit_test.hpp"
-
 namespace gil = boost::gil;
 namespace mp11 = boost::mp11;
 
diff --git a/test/core/pixel/test_fixture.cpp b/test/core/pixel/test_fixture.cpp
index 792159441..173463e9b 100644
--- a/test/core/pixel/test_fixture.cpp
+++ b/test/core/pixel/test_fixture.cpp
@@ -5,8 +5,8 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#include <boost/config.hpp>
-#include <boost/core/ignore_unused.hpp>
+#define BOOST_TEST_MODULE gil/test/core/pixel/test_fixture
+#include "unit_test.hpp"
 
 #if defined(BOOST_CLANG)
 #pragma clang diagnostic push
@@ -25,10 +25,8 @@
 #include <limits>
 #include <ostream>
 
-#define BOOST_TEST_MODULE test_pixel_test_fixture
-#include "unit_test.hpp"
-#include "unit_test_utility.hpp"
 #include "test_fixture.hpp"
+#include "unit_test_utility.hpp"
 
 namespace gil = boost::gil;
 namespace fixture = boost::gil::test::fixture;
diff --git a/test/core/point/Jamfile b/test/core/point/Jamfile
index dd5bf8960..bc3d7ed4b 100644
--- a/test/core/point/Jamfile
+++ b/test/core/point/Jamfile
@@ -8,11 +8,6 @@
 
 import testing ;
 
-project
-    : requirements
-    <include>..
-    ;
-
 compile concepts.cpp ;
 compile-fail multiply_by_non_arithmetic_fail.cpp ;
 run point.cpp ;
diff --git a/test/core/promote_integral.cpp b/test/core/promote_integral.cpp
index e2f8b89f0..b08a2ee55 100644
--- a/test/core/promote_integral.cpp
+++ b/test/core/promote_integral.cpp
@@ -18,6 +18,8 @@
 //
 // Uncomment to enable debugging output
 //#define BOOST_GIL_TEST_DEBUG 1
+#define BOOST_TEST_MODULE gil/test/promote_integral
+#include "unit_test.hpp"
 
 #include <boost/gil/promote_integral.hpp>
 
@@ -30,11 +32,6 @@
 #include <limits>
 #include <string>
 
-#ifndef BOOST_TEST_MODULE
-#define BOOST_TEST_MODULE test_promote_integral
-#endif
-#include "unit_test.hpp"
-
 namespace bg = boost::gil;
 
 template
diff --git a/test/extension/dynamic_image/subimage_view.cpp b/test/extension/dynamic_image/subimage_view.cpp
index 49bf5fa1a..6fc883d09 100644
--- a/test/extension/dynamic_image/subimage_view.cpp
+++ b/test/extension/dynamic_image/subimage_view.cpp
@@ -5,11 +5,12 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/extension/dynamic_image/subimage_view
+#include "unit_test.hpp"
+
 #include <boost/gil.hpp>
 #include <boost/gil/extension/dynamic_image/dynamic_image_all.hpp>
 
-#define BOOST_TEST_MODULE test_ext_dynamic_image_subimage_view
-#include "unit_test.hpp"
 #include "unit_test_utility.hpp"
 #include "test_fixture.hpp"
 #include "core/image/test_fixture.hpp"
diff --git a/test/extension/io/all_formats_test.cpp b/test/extension/io/all_formats_test.cpp
index 34b119897..1d5d81670 100644
--- a/test/extension/io/all_formats_test.cpp
+++ b/test/extension/io/all_formats_test.cpp
@@ -5,7 +5,9 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#define BOOST_TEST_MODULE all_formats_test
+#define BOOST_TEST_MODULE gil/test/extension/io/all_formats_test
+#include "unit_test.hpp"
+
 #include <boost/gil/extension/io/png.hpp>
 #include <boost/gil/extension/io/bmp.hpp>
 #include <boost/gil/extension/io/jpeg.hpp>
@@ -13,8 +15,6 @@
 #include <boost/gil/extension/io/targa.hpp>
 #include <boost/gil/extension/io/tiff.hpp>
 
-#include <boost/test/unit_test.hpp>
-
 #include "paths.hpp"
 
 // Test will include all format's headers and load and write some images.
diff --git a/test/extension/io/bmp_test.cpp b/test/extension/io/bmp_test.cpp
index eb00fee6e..8ae7c01d9 100644
--- a/test/extension/io/bmp_test.cpp
+++ b/test/extension/io/bmp_test.cpp
@@ -5,14 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#define BOOST_TEST_MODULE bmp_test
+#define BOOST_TEST_MODULE gil/test/extension/io/bmp_test
+#include "unit_test.hpp"
+
 #define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT
 #define BOOST_FILESYSTEM_VERSION 3
 #include <boost/gil.hpp>
 #include <boost/gil/extension/io/bmp.hpp>
 
 #include <boost/mp11.hpp>
-#include <boost/test/unit_test.hpp>
 
 #include <fstream>
 
diff --git a/test/extension/io/jpeg_test.cpp b/test/extension/io/jpeg_test.cpp
index d3b98dee5..2549143ca 100644
--- a/test/extension/io/jpeg_test.cpp
+++ b/test/extension/io/jpeg_test.cpp
@@ -5,15 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#define BOOST_TEST_MODULE jpeg_test
+#define BOOST_TEST_MODULE gil/test/extension/io/jpeg_test
+#include "unit_test.hpp"
+
 #define BOOST_FILESYSTEM_VERSION 3
 #define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT
-
 #include <boost/gil.hpp>
 #include <boost/gil/extension/io/jpeg.hpp>
 
 #include <boost/mp11.hpp>
-#include <boost/test/unit_test.hpp>
 
 #include <fstream>
 
diff --git a/test/extension/io/png_test.cpp b/test/extension/io/png_test.cpp
index 287aa8ff5..b7b755520 100644
--- a/test/extension/io/png_test.cpp
+++ b/test/extension/io/png_test.cpp
@@ -5,15 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#define BOOST_TEST_MODULE png_test
+#define BOOST_TEST_MODULE gil/test/extension/io/png_test
+#include "unit_test.hpp"
+
 //#define BOOST_GIL_IO_PNG_FLOATING_POINT_SUPPORTED
 //#define BOOST_GIL_IO_PNG_FIXED_POINT_SUPPORTED
-
 #include <boost/gil.hpp>
 #include <boost/gil/extension/io/png.hpp>
 
 #include <boost/mp11.hpp>
-#include <boost/test/unit_test.hpp>
 
 #include <fstream>
 
diff --git a/test/extension/io/pnm_test.cpp b/test/extension/io/pnm_test.cpp
index 6346d7d5f..7d34fa5a3 100644
--- a/test/extension/io/pnm_test.cpp
+++ b/test/extension/io/pnm_test.cpp
@@ -5,13 +5,13 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#define BOOST_TEST_MODULE pnm_test
+#define BOOST_TEST_MODULE gil/test/extension/io/pnm_test
+#include "unit_test.hpp"
 
 #include <boost/gil.hpp>
 #include <boost/gil/extension/io/pnm.hpp>
 
 #include <boost/mp11.hpp>
-#include <boost/test/unit_test.hpp>
 
 #include <fstream>
 
diff --git a/test/extension/io/raw_test.cpp b/test/extension/io/raw_test.cpp
index 286f10ea6..5d2de5668 100644
--- a/test/extension/io/raw_test.cpp
+++ b/test/extension/io/raw_test.cpp
@@ -5,15 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#define BOOST_TEST_MODULE raw_test
+#define BOOST_TEST_MODULE gil/test/extension/io/raw_test
+#include "unit_test.hpp"
+
 #define BOOST_FILESYSTEM_VERSION 3
 #define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT
-
 #include <boost/gil.hpp>
 #include <boost/gil/extension/io/raw.hpp>
 
 #include <boost/mp11.hpp>
-#include <boost/test/unit_test.hpp>
 
 #include <fstream>
 
diff --git a/test/extension/io/targa_test.cpp b/test/extension/io/targa_test.cpp
index 29176f658..ccba4577c 100644
--- a/test/extension/io/targa_test.cpp
+++ b/test/extension/io/targa_test.cpp
@@ -5,14 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#define BOOST_TEST_MODULE targa_test
+#define BOOST_TEST_MODULE gil/test/extension/io/targa_test
+#include "unit_test.hpp"
+
 #define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT
 
 #include <boost/gil.hpp>
 #include <boost/gil/extension/io/targa.hpp>
 
 #include <boost/mp11.hpp>
-#include <boost/test/unit_test.hpp>
 
 #include <fstream>
 
diff --git a/test/extension/io/tiff_test.cpp b/test/extension/io/tiff_test.cpp
index 62d6b9af5..541edf258 100644
--- a/test/extension/io/tiff_test.cpp
+++ b/test/extension/io/tiff_test.cpp
@@ -5,14 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#define BOOST_TEST_MODULE tiff_test
+#define BOOST_TEST_MODULE gil/test/extension/io/tiff_test
+#include "unit_test.hpp"
+
 #define BOOST_FILESYSTEM_VERSION 3
 #define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT
 
 #include <boost/gil/extension/io/tiff.hpp>
 
 #include <boost/mp11.hpp>
-#include <boost/test/unit_test.hpp>
 
 #include <fstream>
 #include <sstream>
diff --git a/test/extension/numeric/channel_numeric_operations.cpp b/test/extension/numeric/channel_numeric_operations.cpp
index 6ece4f259..ddc388688 100644
--- a/test/extension/numeric/channel_numeric_operations.cpp
+++ b/test/extension/numeric/channel_numeric_operations.cpp
@@ -5,14 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/extension/numeric/channel_numeric_operations
+#include "unit_test.hpp"
+
 #include <boost/gil.hpp>
 #include <boost/gil/extension/numeric/channel_numeric_operations.hpp>
 
 #include <tuple>
 #include <type_traits>
 
-#define BOOST_TEST_MODULE test_ext_numeric_pixel_numeric_operations
-#include "unit_test.hpp"
 #include "unit_test_utility.hpp"
 #include "core/channel/test_fixture.hpp"
 
diff --git a/test/extension/numeric/convolve.cpp b/test/extension/numeric/convolve.cpp
index d12fc9ac4..48621cf04 100644
--- a/test/extension/numeric/convolve.cpp
+++ b/test/extension/numeric/convolve.cpp
@@ -5,14 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/extension/numeric/convolve
+#include "unit_test.hpp"
+
 #include <boost/gil.hpp>
 #include <boost/gil/extension/numeric/convolve.hpp>
 
 #include <tuple>
 #include <type_traits>
 
-#define BOOST_TEST_MODULE test_ext_numeric_colvolve_2d
-#include "unit_test.hpp"
 #include "unit_test_utility.hpp"
 #include "test_fixture.hpp"
 #include "core/image/test_fixture.hpp"
diff --git a/test/extension/numeric/convolve_2d.cpp b/test/extension/numeric/convolve_2d.cpp
index 0a1012ebe..bc08f5eaf 100644
--- a/test/extension/numeric/convolve_2d.cpp
+++ b/test/extension/numeric/convolve_2d.cpp
@@ -5,15 +5,14 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
+#define BOOST_TEST_MODULE gil/test/extension/numeric/convolve_2d
+#include "unit_test.hpp"
 
 #include <cstddef>
 
 #include <boost/gil.hpp>
 #include <boost/gil/extension/numeric/convolve.hpp>
 
-#define BOOST_TEST_MODULE test_ext_convolve_2d
-#include "unit_test.hpp"
-
 namespace gil = boost::gil;
 
 std::uint8_t img[] =
diff --git a/test/extension/numeric/convolve_cols.cpp b/test/extension/numeric/convolve_cols.cpp
index 51b7aceea..66cf6608a 100644
--- a/test/extension/numeric/convolve_cols.cpp
+++ b/test/extension/numeric/convolve_cols.cpp
@@ -5,14 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/extension/numeric/convolve_cols
+#include "unit_test.hpp"
+
 #include <boost/gil.hpp>
 #include <boost/gil/extension/numeric/convolve.hpp>
 
 #include <tuple>
 #include <type_traits>
 
-#define BOOST_TEST_MODULE test_ext_numeric_colvolve_cols
-#include "unit_test.hpp"
 #include "unit_test_utility.hpp"
 #include "test_fixture.hpp"
 #include "core/image/test_fixture.hpp"
diff --git a/test/extension/numeric/convolve_rows.cpp b/test/extension/numeric/convolve_rows.cpp
index 8e50d282d..637258785 100644
--- a/test/extension/numeric/convolve_rows.cpp
+++ b/test/extension/numeric/convolve_rows.cpp
@@ -5,14 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/extension/numeric/convolve_rows
+#include "unit_test.hpp"
+
 #include <boost/gil.hpp>
 #include <boost/gil/extension/numeric/convolve.hpp>
 
 #include <tuple>
 #include <type_traits>
 
-#define BOOST_TEST_MODULE test_ext_numeric_colvolve_rows
-#include "unit_test.hpp"
 #include "unit_test_utility.hpp"
 #include "test_fixture.hpp"
 #include "core/image/test_fixture.hpp"
diff --git a/test/extension/numeric/extend_boundary.cpp b/test/extension/numeric/extend_boundary.cpp
index 81b34a566..fa9e7ec2e 100644
--- a/test/extension/numeric/extend_boundary.cpp
+++ b/test/extension/numeric/extend_boundary.cpp
@@ -5,15 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-
-#define BOOST_TEST_MODULE test_ext_numeric_extend_boundary
+#define BOOST_TEST_MODULE gil/test/extension/numeric/extend_boundary
 #include "unit_test.hpp"
-#include "unit_test_utility.hpp"
 
 #include <boost/gil.hpp>
 #include <boost/gil/extension/numeric/algorithm.hpp>
 #include <boost/gil/extension/numeric/convolve.hpp>
 
+#include "unit_test_utility.hpp"
+
 namespace gil = boost::gil;
 
 std::uint8_t img[] =
diff --git a/test/extension/numeric/kernel.cpp b/test/extension/numeric/kernel.cpp
index de273a4b2..b162fcc4e 100644
--- a/test/extension/numeric/kernel.cpp
+++ b/test/extension/numeric/kernel.cpp
@@ -6,13 +6,13 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/extension/numeric/kernel
+#include "unit_test.hpp"
+
 #define BOOST_DISABLE_ASSERTS 1 // kernel_1d_adaptor assertions are too strict
 #include <boost/gil/extension/numeric/kernel.hpp>
 #include <vector>
 
-#define BOOST_TEST_MODULE test_ext_numeric_kernel
-#include "unit_test.hpp"
-
 namespace gil = boost::gil;
 
 BOOST_AUTO_TEST_CASE(kernel_1d_default_constructor)
diff --git a/test/extension/numeric/matrix3x2.cpp b/test/extension/numeric/matrix3x2.cpp
index 452db415f..525f8feab 100644
--- a/test/extension/numeric/matrix3x2.cpp
+++ b/test/extension/numeric/matrix3x2.cpp
@@ -5,14 +5,14 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/extension/numeric/matrix3x2
+#include "unit_test.hpp"
+
 #include <boost/gil/extension/numeric/affine.hpp>
 #include <boost/gil/extension/numeric/resample.hpp>
 #include <boost/gil/extension/numeric/sampler.hpp>
 #include <boost/gil.hpp>
 
-#define BOOST_TEST_MODULE test_ext_numeric_matrix3x2
-#include "unit_test.hpp"
-
 namespace gil = boost::gil;
 
 namespace {
diff --git a/test/extension/numeric/numeric.cpp b/test/extension/numeric/numeric.cpp
index 48f68b356..b32b7123a 100644
--- a/test/extension/numeric/numeric.cpp
+++ b/test/extension/numeric/numeric.cpp
@@ -5,6 +5,9 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/extension/numeric/numeric
+#include "unit_test.hpp"
+
 #include <boost/gil/image.hpp>
 #include <boost/gil/typedefs.hpp>
 
@@ -13,9 +16,6 @@
 
 #include <boost/assert.hpp>
 
-#define BOOST_TEST_MODULE test_ext_numeric_numeric
-#include "unit_test.hpp"
-
 using namespace boost;
 using namespace gil;
 
diff --git a/test/extension/numeric/pixel_numeric_operations.cpp b/test/extension/numeric/pixel_numeric_operations.cpp
index eb4f15447..280a3f1d9 100644
--- a/test/extension/numeric/pixel_numeric_operations.cpp
+++ b/test/extension/numeric/pixel_numeric_operations.cpp
@@ -5,14 +5,15 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
+#define BOOST_TEST_MODULE gil/test/extension/numeric/pixel_numeric_operations
+#include "unit_test.hpp"
+
 #include <boost/gil.hpp>
 #include <boost/gil/extension/numeric/pixel_numeric_operations.hpp>
 
 #include <tuple>
 #include <type_traits>
 
-#define BOOST_TEST_MODULE test_ext_numeric_pixel_numeric_operations
-#include "unit_test.hpp"
 #include "unit_test_utility.hpp"
 #include "core/image/test_fixture.hpp" // random_value
 #include "core/pixel/test_fixture.hpp"
diff --git a/test/unit_test.hpp b/test/unit_test.hpp
index 2d9fbcaa4..faa6812f2 100644
--- a/test/unit_test.hpp
+++ b/test/unit_test.hpp
@@ -42,6 +42,8 @@
 #pragma GCC diagnostic pop
 #endif
 
+#include <boost/core/ignore_unused.hpp>
+
 namespace btt = boost::test_tools;
 namespace but = boost::unit_test;