diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index d91542951..0f1d36035 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -29,4 +29,3 @@ build-project policies ;
 build-project io ;
 build-project util ;
 build-project views ;
-build-project multi ;
diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2
index 45209b5ad..9cd6dc4d0 100644
--- a/test/algorithms/Jamfile.v2
+++ b/test/algorithms/Jamfile.v2
@@ -8,6 +8,7 @@
 # Modifications copyright (c) 2014, Oracle and/or its affiliates.
 #
 # Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -24,67 +25,45 @@ test-suite boost-geometry-algorithms
     [ run convex_hull.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run correct.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run convert.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run covered_by.cpp ]
-    [ run crosses.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run difference.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run difference_linear_linear.cpp ]
-    [ run difference_pl_pl.cpp ]
-    [ run disjoint.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run disjoint_coverage.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run distance.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run distance_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run distance_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run distance_linear_linear.cpp ]
-    [ run distance_pointlike_areal.cpp ]
-    [ run distance_pointlike_linear.cpp ]
-    [ run distance_pointlike_pointlike.cpp ]
-    [ run distance_se_pl_pl.cpp ]
     [ run envelope.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run equals.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run expand.cpp ]
     [ run for_each.cpp ]
-    [ run intersection.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run intersection_linear_linear.cpp ]
-    [ run intersection_pl_pl.cpp ]
-    [ run intersects.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run is_simple.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run is_valid.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run length.cpp ]
     [ run make.cpp ]
+    [ run multi_area.cpp ]
+    [ run multi_centroid.cpp ]
+    [ run multi_convert.cpp ]
+    [ run multi_convex_hull.cpp ]
+    [ run multi_correct.cpp ]
+    [ run multi_envelope.cpp ]
+    [ run multi_for_each.cpp ]
+    [ run multi_length.cpp ]
+    [ run multi_num_geometries.cpp ]
+    [ run multi_num_interior_rings.cpp ]
+    [ run multi_num_points.cpp ]
+    [ run multi_perimeter.cpp ]
+    [ run multi_reverse.cpp ]
+    [ run multi_simplify.cpp ]
+    [ run multi_transform.cpp ]
+    [ run multi_unique.cpp ]
     [ run num_geometries.cpp ]
     [ run num_interior_rings.cpp ]
     [ run num_points.cpp ]
     [ run num_segments.cpp ]
-    [ run overlaps.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run perimeter.cpp ]
     [ run point_on_surface.cpp ]
-    [ run relate_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run relate_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run relate_linear_linear.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run relate_pointlike_xxx.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run remove_spikes.cpp ]
     [ run reverse.cpp ]
     [ run simplify.cpp ]
-    [ run sym_difference_linear_linear.cpp ]
-    [ run touches.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run transform.cpp ]
-    [ run union.cpp                : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run union_linear_linear.cpp ]
-    [ run union_pl_pl.cpp ]
     [ run unique.cpp ]
-    [ run within.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run within_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run within_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run within_linear_linear.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run within_pointlike_xxx.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]    
     ;
 
-build-project overlay 
-    ;
-
-build-project buffer
-    ;
-    
-build-project detail 
-    ;
-    
+build-project buffer ;
+build-project detail ;
+build-project distance ;
+build-project overlay ;
+build-project relational_operations ;
+build-project set_operations ;
diff --git a/test/algorithms/distance/Jamfile.v2 b/test/algorithms/distance/Jamfile.v2
new file mode 100644
index 000000000..8d755c94a
--- /dev/null
+++ b/test/algorithms/distance/Jamfile.v2
@@ -0,0 +1,27 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is 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)
+
+test-suite boost-geometry-algorithms-distance
+    :
+    [ run distance.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run distance_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run distance_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run distance_linear_linear.cpp ]
+    [ run distance_pointlike_areal.cpp ]
+    [ run distance_pointlike_linear.cpp ]
+    [ run distance_pointlike_pointlike.cpp ]
+    [ run distance_se_pl_pl.cpp ]
+    ;
diff --git a/test/algorithms/distance.cpp b/test/algorithms/distance/distance.cpp
similarity index 99%
rename from test/algorithms/distance.cpp
rename to test/algorithms/distance/distance.cpp
index 8f2dfd03c..84e066808 100644
--- a/test/algorithms/distance.cpp
+++ b/test/algorithms/distance/distance.cpp
@@ -16,7 +16,7 @@
 #include <string>
 #include <sstream>
 
-#include <algorithms/test_distance.hpp>
+#include "test_distance.hpp"
 
 #include <boost/mpl/if.hpp>
 #include <boost/array.hpp>
diff --git a/test/algorithms/distance_all.cpp b/test/algorithms/distance/distance_all.cpp
similarity index 100%
rename from test/algorithms/distance_all.cpp
rename to test/algorithms/distance/distance_all.cpp
diff --git a/test/algorithms/distance_areal_areal.cpp b/test/algorithms/distance/distance_areal_areal.cpp
similarity index 100%
rename from test/algorithms/distance_areal_areal.cpp
rename to test/algorithms/distance/distance_areal_areal.cpp
diff --git a/test/algorithms/distance_linear_areal.cpp b/test/algorithms/distance/distance_linear_areal.cpp
similarity index 100%
rename from test/algorithms/distance_linear_areal.cpp
rename to test/algorithms/distance/distance_linear_areal.cpp
diff --git a/test/algorithms/distance_linear_linear.cpp b/test/algorithms/distance/distance_linear_linear.cpp
similarity index 100%
rename from test/algorithms/distance_linear_linear.cpp
rename to test/algorithms/distance/distance_linear_linear.cpp
diff --git a/test/algorithms/distance_pointlike_areal.cpp b/test/algorithms/distance/distance_pointlike_areal.cpp
similarity index 100%
rename from test/algorithms/distance_pointlike_areal.cpp
rename to test/algorithms/distance/distance_pointlike_areal.cpp
diff --git a/test/algorithms/distance_pointlike_linear.cpp b/test/algorithms/distance/distance_pointlike_linear.cpp
similarity index 100%
rename from test/algorithms/distance_pointlike_linear.cpp
rename to test/algorithms/distance/distance_pointlike_linear.cpp
diff --git a/test/algorithms/distance_pointlike_pointlike.cpp b/test/algorithms/distance/distance_pointlike_pointlike.cpp
similarity index 100%
rename from test/algorithms/distance_pointlike_pointlike.cpp
rename to test/algorithms/distance/distance_pointlike_pointlike.cpp
diff --git a/test/algorithms/distance_se_pl_pl.cpp b/test/algorithms/distance/distance_se_pl_pl.cpp
similarity index 100%
rename from test/algorithms/distance_se_pl_pl.cpp
rename to test/algorithms/distance/distance_se_pl_pl.cpp
diff --git a/test/algorithms/test_distance.hpp b/test/algorithms/distance/test_distance.hpp
similarity index 100%
rename from test/algorithms/test_distance.hpp
rename to test/algorithms/distance/test_distance.hpp
diff --git a/test/algorithms/test_distance_common.hpp b/test/algorithms/distance/test_distance_common.hpp
similarity index 99%
rename from test/algorithms/test_distance_common.hpp
rename to test/algorithms/distance/test_distance_common.hpp
index 31159e08b..62e87e368 100644
--- a/test/algorithms/test_distance_common.hpp
+++ b/test/algorithms/distance/test_distance_common.hpp
@@ -39,8 +39,7 @@
 #include <boost/geometry/algorithms/distance.hpp>
 #include <boost/geometry/algorithms/comparable_distance.hpp>
 
-#include "from_wkt.hpp"
-
+#include <from_wkt.hpp>
 #include <string_from_type.hpp>
 
 
diff --git a/test/algorithms/test_distance_se_common.hpp b/test/algorithms/distance/test_distance_se_common.hpp
similarity index 99%
rename from test/algorithms/test_distance_se_common.hpp
rename to test/algorithms/distance/test_distance_se_common.hpp
index be6ffbc17..8294ea934 100644
--- a/test/algorithms/test_distance_se_common.hpp
+++ b/test/algorithms/distance/test_distance_se_common.hpp
@@ -39,8 +39,7 @@
 #include <boost/geometry/algorithms/distance.hpp>
 #include <boost/geometry/algorithms/comparable_distance.hpp>
 
-#include "from_wkt.hpp"
-
+#include <from_wkt.hpp>
 #include <string_from_type.hpp>
 
 
diff --git a/test/algorithms/is_simple.cpp b/test/algorithms/is_simple.cpp
index 63fac7bfa..34ec07e54 100644
--- a/test/algorithms/is_simple.cpp
+++ b/test/algorithms/is_simple.cpp
@@ -36,7 +36,7 @@
 #include <boost/geometry/algorithms/is_valid.hpp>
 #include <boost/geometry/algorithms/is_simple.hpp>
 
-#include "from_wkt.hpp"
+#include <from_wkt.hpp>
 
 #ifdef BOOST_GEOMETRY_TEST_DEBUG
 #include "pretty_print_geometry.hpp"
diff --git a/test/algorithms/is_valid.cpp b/test/algorithms/is_valid.cpp
index 46c2c6772..78c290556 100644
--- a/test/algorithms/is_valid.cpp
+++ b/test/algorithms/is_valid.cpp
@@ -16,7 +16,7 @@
 
 #include <boost/test/included/unit_test.hpp>
 
-#include "from_wkt.hpp"
+#include <from_wkt.hpp>
 #include "test_is_valid.hpp"
 
 
diff --git a/test/multi/algorithms/multi_area.cpp b/test/algorithms/multi_area.cpp
similarity index 100%
rename from test/multi/algorithms/multi_area.cpp
rename to test/algorithms/multi_area.cpp
diff --git a/test/multi/algorithms/multi_centroid.cpp b/test/algorithms/multi_centroid.cpp
similarity index 100%
rename from test/multi/algorithms/multi_centroid.cpp
rename to test/algorithms/multi_centroid.cpp
diff --git a/test/multi/algorithms/multi_clear.cpp b/test/algorithms/multi_clear.cpp
similarity index 100%
rename from test/multi/algorithms/multi_clear.cpp
rename to test/algorithms/multi_clear.cpp
diff --git a/test/multi/algorithms/multi_convert.cpp b/test/algorithms/multi_convert.cpp
similarity index 100%
rename from test/multi/algorithms/multi_convert.cpp
rename to test/algorithms/multi_convert.cpp
diff --git a/test/multi/algorithms/multi_convex_hull.cpp b/test/algorithms/multi_convex_hull.cpp
similarity index 100%
rename from test/multi/algorithms/multi_convex_hull.cpp
rename to test/algorithms/multi_convex_hull.cpp
diff --git a/test/multi/algorithms/multi_correct.cpp b/test/algorithms/multi_correct.cpp
similarity index 100%
rename from test/multi/algorithms/multi_correct.cpp
rename to test/algorithms/multi_correct.cpp
diff --git a/test/multi/algorithms/multi_envelope.cpp b/test/algorithms/multi_envelope.cpp
similarity index 100%
rename from test/multi/algorithms/multi_envelope.cpp
rename to test/algorithms/multi_envelope.cpp
diff --git a/test/multi/algorithms/multi_for_each.cpp b/test/algorithms/multi_for_each.cpp
similarity index 100%
rename from test/multi/algorithms/multi_for_each.cpp
rename to test/algorithms/multi_for_each.cpp
diff --git a/test/multi/algorithms/multi_length.cpp b/test/algorithms/multi_length.cpp
similarity index 100%
rename from test/multi/algorithms/multi_length.cpp
rename to test/algorithms/multi_length.cpp
diff --git a/test/multi/algorithms/multi_num_geometries.cpp b/test/algorithms/multi_num_geometries.cpp
similarity index 100%
rename from test/multi/algorithms/multi_num_geometries.cpp
rename to test/algorithms/multi_num_geometries.cpp
diff --git a/test/multi/algorithms/multi_num_interior_rings.cpp b/test/algorithms/multi_num_interior_rings.cpp
similarity index 100%
rename from test/multi/algorithms/multi_num_interior_rings.cpp
rename to test/algorithms/multi_num_interior_rings.cpp
diff --git a/test/multi/algorithms/multi_num_points.cpp b/test/algorithms/multi_num_points.cpp
similarity index 100%
rename from test/multi/algorithms/multi_num_points.cpp
rename to test/algorithms/multi_num_points.cpp
diff --git a/test/multi/algorithms/multi_perimeter.cpp b/test/algorithms/multi_perimeter.cpp
similarity index 100%
rename from test/multi/algorithms/multi_perimeter.cpp
rename to test/algorithms/multi_perimeter.cpp
diff --git a/test/multi/algorithms/multi_reverse.cpp b/test/algorithms/multi_reverse.cpp
similarity index 100%
rename from test/multi/algorithms/multi_reverse.cpp
rename to test/algorithms/multi_reverse.cpp
diff --git a/test/multi/algorithms/multi_simplify.cpp b/test/algorithms/multi_simplify.cpp
similarity index 100%
rename from test/multi/algorithms/multi_simplify.cpp
rename to test/algorithms/multi_simplify.cpp
diff --git a/test/multi/algorithms/multi_transform.cpp b/test/algorithms/multi_transform.cpp
similarity index 100%
rename from test/multi/algorithms/multi_transform.cpp
rename to test/algorithms/multi_transform.cpp
diff --git a/test/multi/algorithms/multi_unique.cpp b/test/algorithms/multi_unique.cpp
similarity index 100%
rename from test/multi/algorithms/multi_unique.cpp
rename to test/algorithms/multi_unique.cpp
diff --git a/test/algorithms/overlay/Jamfile.v2 b/test/algorithms/overlay/Jamfile.v2
index 9319330e9..2d736874b 100644
--- a/test/algorithms/overlay/Jamfile.v2
+++ b/test/algorithms/overlay/Jamfile.v2
@@ -21,6 +21,7 @@ test-suite boost-geometry-algorithms-overlay
     [ run get_turns.cpp ]
     [ run get_turns_linear_linear.cpp ]
     [ run get_turns_linear_areal.cpp ]
+    [ run multi_traverse.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <define>BOOST_GEOMETRY_RESCALE_TO_ROBUST ]
     [ run relative_order.cpp ]
     [ run select_rings.cpp ]
     [ run self_intersection_points.cpp ]
diff --git a/test/algorithms/overlay/get_turns_linear_areal.cpp b/test/algorithms/overlay/get_turns_linear_areal.cpp
index 202eb28ed..b270edeb6 100644
--- a/test/algorithms/overlay/get_turns_linear_areal.cpp
+++ b/test/algorithms/overlay/get_turns_linear_areal.cpp
@@ -21,7 +21,7 @@
 #include <boost/geometry/geometries/geometries.hpp>
 
 //TEST
-//#include "to_svg.hpp"
+//#include <to_svg.hpp>
 
 template <typename T>
 void test_all()
diff --git a/test/multi/algorithms/overlay/multi_overlay_cases.hpp b/test/algorithms/overlay/multi_overlay_cases.hpp
similarity index 100%
rename from test/multi/algorithms/overlay/multi_overlay_cases.hpp
rename to test/algorithms/overlay/multi_overlay_cases.hpp
diff --git a/test/multi/algorithms/overlay/multi_overlay_common.hpp b/test/algorithms/overlay/multi_overlay_common.hpp
similarity index 100%
rename from test/multi/algorithms/overlay/multi_overlay_common.hpp
rename to test/algorithms/overlay/multi_overlay_common.hpp
diff --git a/test/multi/algorithms/overlay/multi_traverse.cpp b/test/algorithms/overlay/multi_traverse.cpp
similarity index 100%
rename from test/multi/algorithms/overlay/multi_traverse.cpp
rename to test/algorithms/overlay/multi_traverse.cpp
diff --git a/test/algorithms/relational_operations/Jamfile.v2 b/test/algorithms/relational_operations/Jamfile.v2
new file mode 100644
index 000000000..5b432e2e9
--- /dev/null
+++ b/test/algorithms/relational_operations/Jamfile.v2
@@ -0,0 +1,33 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is 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)
+
+test-suite boost-geometry-algorithms-relational
+    :
+    [ run covered_by.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run crosses.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run equals.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run intersects.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_covered_by.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_equals.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_intersects.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_touches.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run overlaps.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run touches.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    ;
+
+build-project disjoint ;
+build-project relate ;
+build-project within ;
diff --git a/test/algorithms/covered_by.cpp b/test/algorithms/relational_operations/covered_by.cpp
similarity index 99%
rename from test/algorithms/covered_by.cpp
rename to test/algorithms/relational_operations/covered_by.cpp
index b4a00ea89..15031487a 100644
--- a/test/algorithms/covered_by.cpp
+++ b/test/algorithms/relational_operations/covered_by.cpp
@@ -7,7 +7,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <algorithms/test_covered_by.hpp>
+#include "test_covered_by.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>
diff --git a/test/algorithms/crosses.cpp b/test/algorithms/relational_operations/crosses.cpp
similarity index 98%
rename from test/algorithms/crosses.cpp
rename to test/algorithms/relational_operations/crosses.cpp
index 103791018..62cb9146e 100644
--- a/test/algorithms/crosses.cpp
+++ b/test/algorithms/relational_operations/crosses.cpp
@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_crosses.hpp>
+#include "test_crosses.hpp"
 
 template <typename P>
 void test_pl()
diff --git a/test/algorithms/relational_operations/disjoint/Jamfile.v2 b/test/algorithms/relational_operations/disjoint/Jamfile.v2
new file mode 100644
index 000000000..a2423a745
--- /dev/null
+++ b/test/algorithms/relational_operations/disjoint/Jamfile.v2
@@ -0,0 +1,22 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is 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)
+
+test-suite boost-geometry-algorithms-disjoint
+    :
+    [ run disjoint.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run disjoint_coverage.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_disjoint.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    ;
diff --git a/test/algorithms/disjoint.cpp b/test/algorithms/relational_operations/disjoint/disjoint.cpp
similarity index 99%
rename from test/algorithms/disjoint.cpp
rename to test/algorithms/relational_operations/disjoint/disjoint.cpp
index d765ef952..67a0f90a0 100644
--- a/test/algorithms/disjoint.cpp
+++ b/test/algorithms/relational_operations/disjoint/disjoint.cpp
@@ -13,7 +13,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <algorithms/test_disjoint.hpp>
+#include "test_disjoint.hpp"
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
diff --git a/test/algorithms/disjoint_coverage.cpp b/test/algorithms/relational_operations/disjoint/disjoint_coverage.cpp
similarity index 99%
rename from test/algorithms/disjoint_coverage.cpp
rename to test/algorithms/relational_operations/disjoint/disjoint_coverage.cpp
index 184e6988f..7a19c0455 100644
--- a/test/algorithms/disjoint_coverage.cpp
+++ b/test/algorithms/relational_operations/disjoint/disjoint_coverage.cpp
@@ -41,7 +41,7 @@
 
 #include <boost/geometry/algorithms/disjoint.hpp>
 
-#include "from_wkt.hpp"
+#include <from_wkt.hpp>
 
 
 #ifdef HAVE_TTMATH
diff --git a/test/multi/algorithms/multi_disjoint.cpp b/test/algorithms/relational_operations/disjoint/multi_disjoint.cpp
similarity index 99%
rename from test/multi/algorithms/multi_disjoint.cpp
rename to test/algorithms/relational_operations/disjoint/multi_disjoint.cpp
index 05cd985e3..bba5823cd 100644
--- a/test/multi/algorithms/multi_disjoint.cpp
+++ b/test/algorithms/relational_operations/disjoint/multi_disjoint.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <algorithms/test_disjoint.hpp>
+#include "test_disjoint.hpp"
 
 #include <boost/geometry/strategies/strategies.hpp>
 
diff --git a/test/algorithms/test_disjoint.hpp b/test/algorithms/relational_operations/disjoint/test_disjoint.hpp
similarity index 100%
rename from test/algorithms/test_disjoint.hpp
rename to test/algorithms/relational_operations/disjoint/test_disjoint.hpp
diff --git a/test/algorithms/equals.cpp b/test/algorithms/relational_operations/equals.cpp
similarity index 99%
rename from test/algorithms/equals.cpp
rename to test/algorithms/relational_operations/equals.cpp
index 1ee21ec22..8aa8fd30e 100644
--- a/test/algorithms/equals.cpp
+++ b/test/algorithms/relational_operations/equals.cpp
@@ -11,7 +11,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <algorithms/test_equals.hpp>
+#include "test_equals.hpp"
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
diff --git a/test/algorithms/intersects.cpp b/test/algorithms/relational_operations/intersects.cpp
similarity index 99%
rename from test/algorithms/intersects.cpp
rename to test/algorithms/relational_operations/intersects.cpp
index 82bd0fe8e..01b2f73e5 100644
--- a/test/algorithms/intersects.cpp
+++ b/test/algorithms/relational_operations/intersects.cpp
@@ -10,7 +10,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <algorithms/test_intersects.hpp>
+#include "test_intersects.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>
diff --git a/test/multi/algorithms/multi_covered_by.cpp b/test/algorithms/relational_operations/multi_covered_by.cpp
similarity index 97%
rename from test/multi/algorithms/multi_covered_by.cpp
rename to test/algorithms/relational_operations/multi_covered_by.cpp
index df40109e5..7489435b4 100644
--- a/test/multi/algorithms/multi_covered_by.cpp
+++ b/test/algorithms/relational_operations/multi_covered_by.cpp
@@ -22,7 +22,7 @@
 #include <boost/geometry/io/wkt/wkt.hpp>
 #include <boost/geometry/multi/io/wkt/wkt.hpp>
 
-#include <algorithms/test_covered_by.hpp>
+#include "test_covered_by.hpp"
 
 
 template <typename P>
diff --git a/test/multi/algorithms/multi_equals.cpp b/test/algorithms/relational_operations/multi_equals.cpp
similarity index 97%
rename from test/multi/algorithms/multi_equals.cpp
rename to test/algorithms/relational_operations/multi_equals.cpp
index 64bc0d470..d1239d38f 100644
--- a/test/multi/algorithms/multi_equals.cpp
+++ b/test/algorithms/relational_operations/multi_equals.cpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <algorithms/test_equals.hpp>
+#include "test_equals.hpp"
 
 #include <boost/geometry/multi/algorithms/area.hpp>
 #include <boost/geometry/multi/algorithms/equals.hpp>
diff --git a/test/multi/algorithms/multi_intersects.cpp b/test/algorithms/relational_operations/multi_intersects.cpp
similarity index 96%
rename from test/multi/algorithms/multi_intersects.cpp
rename to test/algorithms/relational_operations/multi_intersects.cpp
index d07b8b6cf..1880064f8 100644
--- a/test/multi/algorithms/multi_intersects.cpp
+++ b/test/algorithms/relational_operations/multi_intersects.cpp
@@ -13,7 +13,7 @@
 
 #include <geometry_test_common.hpp>
 
-#include <algorithms/test_intersects.hpp>
+#include "test_intersects.hpp"
 
 #include <boost/geometry.hpp>
 
diff --git a/test/multi/algorithms/multi_touches.cpp b/test/algorithms/relational_operations/multi_touches.cpp
similarity index 98%
rename from test/multi/algorithms/multi_touches.cpp
rename to test/algorithms/relational_operations/multi_touches.cpp
index 8774beaf2..86456b04a 100644
--- a/test/multi/algorithms/multi_touches.cpp
+++ b/test/algorithms/relational_operations/multi_touches.cpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <algorithms/test_touches.hpp>
+#include "test_touches.hpp"
 
 #include <boost/geometry/multi/algorithms/area.hpp>
 #include <boost/geometry/multi/algorithms/num_geometries.hpp>
diff --git a/test/algorithms/overlaps.cpp b/test/algorithms/relational_operations/overlaps.cpp
similarity index 98%
rename from test/algorithms/overlaps.cpp
rename to test/algorithms/relational_operations/overlaps.cpp
index 14c615e25..594cb1084 100644
--- a/test/algorithms/overlaps.cpp
+++ b/test/algorithms/relational_operations/overlaps.cpp
@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_overlaps.hpp>
+#include "test_overlaps.hpp"
 
 template <typename P>
 void test_box_box_2d()
diff --git a/test/algorithms/relational_operations/relate/Jamfile.v2 b/test/algorithms/relational_operations/relate/Jamfile.v2
new file mode 100644
index 000000000..871b8eb17
--- /dev/null
+++ b/test/algorithms/relational_operations/relate/Jamfile.v2
@@ -0,0 +1,23 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is 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)
+
+test-suite boost-geometry-algorithms-relate
+    :
+    [ run relate_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run relate_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run relate_linear_linear.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run relate_pointlike_xxx.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    ;
diff --git a/test/algorithms/relate_areal_areal.cpp b/test/algorithms/relational_operations/relate/relate_areal_areal.cpp
similarity index 99%
rename from test/algorithms/relate_areal_areal.cpp
rename to test/algorithms/relational_operations/relate/relate_areal_areal.cpp
index fd9e84c40..0e8d95339 100644
--- a/test/algorithms/relate_areal_areal.cpp
+++ b/test/algorithms/relational_operations/relate/relate_areal_areal.cpp
@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_relate.hpp>
+#include "test_relate.hpp"
 
 //TEST
 //#include <to_svg.hpp>
diff --git a/test/algorithms/relate_linear_areal.cpp b/test/algorithms/relational_operations/relate/relate_linear_areal.cpp
similarity index 99%
rename from test/algorithms/relate_linear_areal.cpp
rename to test/algorithms/relational_operations/relate/relate_linear_areal.cpp
index 0096a01aa..09fd7c4dd 100644
--- a/test/algorithms/relate_linear_areal.cpp
+++ b/test/algorithms/relational_operations/relate/relate_linear_areal.cpp
@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_relate.hpp>
+#include "test_relate.hpp"
 
 //TEST
 //#include <to_svg.hpp>
diff --git a/test/algorithms/relate_linear_linear.cpp b/test/algorithms/relational_operations/relate/relate_linear_linear.cpp
similarity index 99%
rename from test/algorithms/relate_linear_linear.cpp
rename to test/algorithms/relational_operations/relate/relate_linear_linear.cpp
index f847db6fd..d1b43bb48 100644
--- a/test/algorithms/relate_linear_linear.cpp
+++ b/test/algorithms/relational_operations/relate/relate_linear_linear.cpp
@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_relate.hpp>
+#include "test_relate.hpp"
 
 //TEST
 //#include <to_svg.hpp>
diff --git a/test/algorithms/relate_pointlike_xxx.cpp b/test/algorithms/relational_operations/relate/relate_pointlike_xxx.cpp
similarity index 99%
rename from test/algorithms/relate_pointlike_xxx.cpp
rename to test/algorithms/relational_operations/relate/relate_pointlike_xxx.cpp
index 02d1fd84e..f9314454f 100644
--- a/test/algorithms/relate_pointlike_xxx.cpp
+++ b/test/algorithms/relational_operations/relate/relate_pointlike_xxx.cpp
@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_relate.hpp>
+#include "test_relate.hpp"
 
 //TEST
 //#include <to_svg.hpp>
diff --git a/test/algorithms/test_relate.hpp b/test/algorithms/relational_operations/relate/test_relate.hpp
similarity index 100%
rename from test/algorithms/test_relate.hpp
rename to test/algorithms/relational_operations/relate/test_relate.hpp
diff --git a/test/algorithms/test_covered_by.hpp b/test/algorithms/relational_operations/test_covered_by.hpp
similarity index 100%
rename from test/algorithms/test_covered_by.hpp
rename to test/algorithms/relational_operations/test_covered_by.hpp
diff --git a/test/algorithms/test_crosses.hpp b/test/algorithms/relational_operations/test_crosses.hpp
similarity index 100%
rename from test/algorithms/test_crosses.hpp
rename to test/algorithms/relational_operations/test_crosses.hpp
diff --git a/test/algorithms/test_equals.hpp b/test/algorithms/relational_operations/test_equals.hpp
similarity index 100%
rename from test/algorithms/test_equals.hpp
rename to test/algorithms/relational_operations/test_equals.hpp
diff --git a/test/algorithms/test_intersects.hpp b/test/algorithms/relational_operations/test_intersects.hpp
similarity index 100%
rename from test/algorithms/test_intersects.hpp
rename to test/algorithms/relational_operations/test_intersects.hpp
diff --git a/test/algorithms/test_overlaps.hpp b/test/algorithms/relational_operations/test_overlaps.hpp
similarity index 100%
rename from test/algorithms/test_overlaps.hpp
rename to test/algorithms/relational_operations/test_overlaps.hpp
diff --git a/test/algorithms/test_touches.hpp b/test/algorithms/relational_operations/test_touches.hpp
similarity index 100%
rename from test/algorithms/test_touches.hpp
rename to test/algorithms/relational_operations/test_touches.hpp
diff --git a/test/algorithms/touches.cpp b/test/algorithms/relational_operations/touches.cpp
similarity index 99%
rename from test/algorithms/touches.cpp
rename to test/algorithms/relational_operations/touches.cpp
index 451233ef3..d7a92c8e0 100644
--- a/test/algorithms/touches.cpp
+++ b/test/algorithms/relational_operations/touches.cpp
@@ -11,7 +11,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_touches.hpp>
+#include "test_touches.hpp"
 
 template <typename P>
 void test_all()
diff --git a/test/algorithms/relational_operations/within/Jamfile.v2 b/test/algorithms/relational_operations/within/Jamfile.v2
new file mode 100644
index 000000000..d2a679571
--- /dev/null
+++ b/test/algorithms/relational_operations/within/Jamfile.v2
@@ -0,0 +1,25 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is 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)
+
+test-suite boost-geometry-algorithms-within
+    :
+    [ run multi_within.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_linear_linear.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_pointlike_xxx.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]    
+    ;
diff --git a/test/multi/algorithms/multi_within.cpp b/test/algorithms/relational_operations/within/multi_within.cpp
similarity index 98%
rename from test/multi/algorithms/multi_within.cpp
rename to test/algorithms/relational_operations/within/multi_within.cpp
index 59db2dbc6..cf5573aa6 100644
--- a/test/multi/algorithms/multi_within.cpp
+++ b/test/algorithms/relational_operations/within/multi_within.cpp
@@ -22,7 +22,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 template <typename P>
diff --git a/test/algorithms/test_within.hpp b/test/algorithms/relational_operations/within/test_within.hpp
similarity index 100%
rename from test/algorithms/test_within.hpp
rename to test/algorithms/relational_operations/within/test_within.hpp
diff --git a/test/algorithms/within.cpp b/test/algorithms/relational_operations/within/within.cpp
similarity index 99%
rename from test/algorithms/within.cpp
rename to test/algorithms/relational_operations/within/within.cpp
index 6abdce19b..2300a4ec5 100644
--- a/test/algorithms/within.cpp
+++ b/test/algorithms/relational_operations/within/within.cpp
@@ -12,7 +12,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>
diff --git a/test/algorithms/within_areal_areal.cpp b/test/algorithms/relational_operations/within/within_areal_areal.cpp
similarity index 98%
rename from test/algorithms/within_areal_areal.cpp
rename to test/algorithms/relational_operations/within/within_areal_areal.cpp
index 57f417d95..5e8673c8c 100644
--- a/test/algorithms/within_areal_areal.cpp
+++ b/test/algorithms/relational_operations/within/within_areal_areal.cpp
@@ -12,7 +12,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>
diff --git a/test/algorithms/within_linear_areal.cpp b/test/algorithms/relational_operations/within/within_linear_areal.cpp
similarity index 98%
rename from test/algorithms/within_linear_areal.cpp
rename to test/algorithms/relational_operations/within/within_linear_areal.cpp
index 68f9ce396..412dbd051 100644
--- a/test/algorithms/within_linear_areal.cpp
+++ b/test/algorithms/relational_operations/within/within_linear_areal.cpp
@@ -12,7 +12,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>
diff --git a/test/algorithms/within_linear_linear.cpp b/test/algorithms/relational_operations/within/within_linear_linear.cpp
similarity index 99%
rename from test/algorithms/within_linear_linear.cpp
rename to test/algorithms/relational_operations/within/within_linear_linear.cpp
index bf77d4cb8..6467e0110 100644
--- a/test/algorithms/within_linear_linear.cpp
+++ b/test/algorithms/relational_operations/within/within_linear_linear.cpp
@@ -12,7 +12,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>
diff --git a/test/algorithms/within_pointlike_xxx.cpp b/test/algorithms/relational_operations/within/within_pointlike_xxx.cpp
similarity index 99%
rename from test/algorithms/within_pointlike_xxx.cpp
rename to test/algorithms/relational_operations/within/within_pointlike_xxx.cpp
index 392ee5f78..5ea4f09f2 100644
--- a/test/algorithms/within_pointlike_xxx.cpp
+++ b/test/algorithms/relational_operations/within/within_pointlike_xxx.cpp
@@ -12,7 +12,7 @@
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
-#include <algorithms/test_within.hpp>
+#include "test_within.hpp"
 
 
 #include <boost/geometry/geometries/geometries.hpp>
diff --git a/test/algorithms/set_operations/Jamfile.v2 b/test/algorithms/set_operations/Jamfile.v2
new file mode 100644
index 000000000..27ebad64b
--- /dev/null
+++ b/test/algorithms/set_operations/Jamfile.v2
@@ -0,0 +1,20 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is 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)
+
+build-project difference ;
+build-project intersection ;
+build-project sym_difference ;
+build-project union ;
diff --git a/test/algorithms/set_operations/difference/Jamfile.v2 b/test/algorithms/set_operations/difference/Jamfile.v2
new file mode 100644
index 000000000..2903d9cc5
--- /dev/null
+++ b/test/algorithms/set_operations/difference/Jamfile.v2
@@ -0,0 +1,24 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is 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)
+
+test-suite boost-geometry-algorithms-difference
+    :
+    [ run difference.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    [ run difference_linear_linear.cpp ]
+    [ run difference_pl_pl.cpp ]
+    [ run multi_difference.cpp  : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_difference_spike.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    ;
diff --git a/test/algorithms/difference.cpp b/test/algorithms/set_operations/difference/difference.cpp
similarity index 99%
rename from test/algorithms/difference.cpp
rename to test/algorithms/set_operations/difference/difference.cpp
index 6f83aef4a..a54316beb 100644
--- a/test/algorithms/difference.cpp
+++ b/test/algorithms/set_operations/difference/difference.cpp
@@ -25,10 +25,10 @@
 
 #include <boost/geometry/geometries/point_xy.hpp>
 
-#include <algorithms/test_difference.hpp>
+#include "test_difference.hpp"
 #include <algorithms/test_overlay.hpp>
 #include <algorithms/overlay/overlay_cases.hpp>
-#include <multi/algorithms/overlay/multi_overlay_cases.hpp>
+#include <algorithms/overlay/multi_overlay_cases.hpp>
 #include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 
diff --git a/test/algorithms/difference_linear_linear.cpp b/test/algorithms/set_operations/difference/difference_linear_linear.cpp
similarity index 100%
rename from test/algorithms/difference_linear_linear.cpp
rename to test/algorithms/set_operations/difference/difference_linear_linear.cpp
diff --git a/test/algorithms/difference_pl_pl.cpp b/test/algorithms/set_operations/difference/difference_pl_pl.cpp
similarity index 99%
rename from test/algorithms/difference_pl_pl.cpp
rename to test/algorithms/set_operations/difference/difference_pl_pl.cpp
index 3030dea4e..14a80f485 100644
--- a/test/algorithms/difference_pl_pl.cpp
+++ b/test/algorithms/set_operations/difference/difference_pl_pl.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/test/included/unit_test.hpp>
 
-#include "test_set_ops_pl_pl.hpp"
+#include "../test_set_ops_pl_pl.hpp"
 
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 
diff --git a/test/multi/algorithms/multi_difference.cpp b/test/algorithms/set_operations/difference/multi_difference.cpp
similarity index 98%
rename from test/multi/algorithms/multi_difference.cpp
rename to test/algorithms/set_operations/difference/multi_difference.cpp
index 310931b56..f9e0c3d4d 100644
--- a/test/multi/algorithms/multi_difference.cpp
+++ b/test/algorithms/set_operations/difference/multi_difference.cpp
@@ -23,9 +23,9 @@
 //#define BOOST_GEOMETRY_DEBUG_TRAVERSE
 
 
-#include <algorithms/test_difference.hpp>
+#include "test_difference.hpp"
 #include <algorithms/test_overlay.hpp>
-#include <multi/algorithms/overlay/multi_overlay_cases.hpp>
+#include <algorithms/overlay/multi_overlay_cases.hpp>
 
 #include <boost/geometry/multi/algorithms/correct.hpp>
 #include <boost/geometry/multi/algorithms/intersection.hpp>
diff --git a/test/multi/algorithms/multi_difference_spike.cpp b/test/algorithms/set_operations/difference/multi_difference_spike.cpp
similarity index 99%
rename from test/multi/algorithms/multi_difference_spike.cpp
rename to test/algorithms/set_operations/difference/multi_difference_spike.cpp
index 6753a2380..56a909262 100644
--- a/test/multi/algorithms/multi_difference_spike.cpp
+++ b/test/algorithms/set_operations/difference/multi_difference_spike.cpp
@@ -13,7 +13,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_geometries.hpp>
 
-#include <algorithms/test_difference.hpp>
+#include "test_difference.hpp"
 
 
 template <typename P, bool ClockWise, bool Closed>
diff --git a/test/algorithms/test_difference.hpp b/test/algorithms/set_operations/difference/test_difference.hpp
similarity index 100%
rename from test/algorithms/test_difference.hpp
rename to test/algorithms/set_operations/difference/test_difference.hpp
diff --git a/test/algorithms/test_difference_linear_linear.hpp b/test/algorithms/set_operations/difference/test_difference_linear_linear.hpp
similarity index 98%
rename from test/algorithms/test_difference_linear_linear.hpp
rename to test/algorithms/set_operations/difference/test_difference_linear_linear.hpp
index cf86124a3..daa037151 100644
--- a/test/algorithms/test_difference_linear_linear.hpp
+++ b/test/algorithms/set_operations/difference/test_difference_linear_linear.hpp
@@ -10,10 +10,10 @@
 #ifndef BOOST_GEOMETRY_TEST_DIFFERENCE_LINEAR_LINEAR_HPP
 #define BOOST_GEOMETRY_TEST_DIFFERENCE_LINEAR_LINEAR_HPP
 
-#include "from_wkt.hpp"
 #include <boost/geometry/geometry.hpp>
-#include "test_set_ops_linear_linear.hpp"
-#include "to_svg.hpp"
+#include "../test_set_ops_linear_linear.hpp"
+#include <from_wkt.hpp>
+#include <to_svg.hpp>
 
 
 //==================================================================
diff --git a/test/algorithms/set_operations/intersection/Jamfile.v2 b/test/algorithms/set_operations/intersection/Jamfile.v2
new file mode 100644
index 000000000..c039b1664
--- /dev/null
+++ b/test/algorithms/set_operations/intersection/Jamfile.v2
@@ -0,0 +1,23 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is 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)
+
+test-suite boost-geometry-algorithms-intersection
+    :
+    [ run intersection.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    [ run intersection_linear_linear.cpp ]
+    [ run intersection_pl_pl.cpp ]
+    [ run multi_intersection.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    ;
diff --git a/test/algorithms/intersection.cpp b/test/algorithms/set_operations/intersection/intersection.cpp
similarity index 99%
rename from test/algorithms/intersection.cpp
rename to test/algorithms/set_operations/intersection/intersection.cpp
index cefdb8ec9..85b266a9f 100644
--- a/test/algorithms/intersection.cpp
+++ b/test/algorithms/set_operations/intersection/intersection.cpp
@@ -26,7 +26,7 @@
 
 #include <boost/geometry/util/rational.hpp>
 
-#include <algorithms/test_intersection.hpp>
+#include "test_intersection.hpp"
 #include <algorithms/test_overlay.hpp>
 
 #include <algorithms/overlay/overlay_cases.hpp>
diff --git a/test/algorithms/intersection_linear_linear.cpp b/test/algorithms/set_operations/intersection/intersection_linear_linear.cpp
similarity index 100%
rename from test/algorithms/intersection_linear_linear.cpp
rename to test/algorithms/set_operations/intersection/intersection_linear_linear.cpp
diff --git a/test/algorithms/intersection_pl_pl.cpp b/test/algorithms/set_operations/intersection/intersection_pl_pl.cpp
similarity index 99%
rename from test/algorithms/intersection_pl_pl.cpp
rename to test/algorithms/set_operations/intersection/intersection_pl_pl.cpp
index da5617b92..27b592e7a 100644
--- a/test/algorithms/intersection_pl_pl.cpp
+++ b/test/algorithms/set_operations/intersection/intersection_pl_pl.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/test/included/unit_test.hpp>
 
-#include "test_set_ops_pl_pl.hpp"
+#include "../test_set_ops_pl_pl.hpp"
 
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 
diff --git a/test/algorithms/intersection_segment.cpp b/test/algorithms/set_operations/intersection/intersection_segment.cpp
similarity index 100%
rename from test/algorithms/intersection_segment.cpp
rename to test/algorithms/set_operations/intersection/intersection_segment.cpp
diff --git a/test/multi/algorithms/multi_intersection.cpp b/test/algorithms/set_operations/intersection/multi_intersection.cpp
similarity index 98%
rename from test/multi/algorithms/multi_intersection.cpp
rename to test/algorithms/set_operations/intersection/multi_intersection.cpp
index 8dea0da23..46106022d 100644
--- a/test/multi/algorithms/multi_intersection.cpp
+++ b/test/algorithms/set_operations/intersection/multi_intersection.cpp
@@ -16,9 +16,9 @@
 
 // #define BOOST_GEOMETRY_DEBUG_ASSEMBLE
 
-#include <algorithms/test_intersection.hpp>
+#include "test_intersection.hpp"
 #include <algorithms/test_overlay.hpp>
-#include <multi/algorithms/overlay/multi_overlay_cases.hpp>
+#include <algorithms/overlay/multi_overlay_cases.hpp>
 
 #include <boost/geometry/multi/algorithms/correct.hpp>
 #include <boost/geometry/multi/algorithms/intersection.hpp>
diff --git a/test/algorithms/test_intersection.hpp b/test/algorithms/set_operations/intersection/test_intersection.hpp
similarity index 100%
rename from test/algorithms/test_intersection.hpp
rename to test/algorithms/set_operations/intersection/test_intersection.hpp
diff --git a/test/algorithms/test_intersection_linear_linear.hpp b/test/algorithms/set_operations/intersection/test_intersection_linear_linear.hpp
similarity index 98%
rename from test/algorithms/test_intersection_linear_linear.hpp
rename to test/algorithms/set_operations/intersection/test_intersection_linear_linear.hpp
index b02aaa35e..bc378f932 100644
--- a/test/algorithms/test_intersection_linear_linear.hpp
+++ b/test/algorithms/set_operations/intersection/test_intersection_linear_linear.hpp
@@ -10,11 +10,11 @@
 #ifndef BOOST_GEOMETRY_TEST_INTERSECTION_LINEAR_LINEAR_HPP
 #define BOOST_GEOMETRY_TEST_INTERSECTION_LINEAR_LINEAR_HPP
 
-#include "from_wkt.hpp"
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/geometry.hpp>
-#include "test_set_ops_linear_linear.hpp"
-#include "to_svg.hpp"
+#include "../test_set_ops_linear_linear.hpp"
+#include <from_wkt.hpp>
+#include <to_svg.hpp>
 
 
 //==================================================================
diff --git a/test/algorithms/set_ops_ll.cpp b/test/algorithms/set_operations/set_ops_ll.cpp
similarity index 100%
rename from test/algorithms/set_ops_ll.cpp
rename to test/algorithms/set_operations/set_ops_ll.cpp
diff --git a/test/algorithms/set_ops_pp.cpp b/test/algorithms/set_operations/set_ops_pp.cpp
similarity index 100%
rename from test/algorithms/set_ops_pp.cpp
rename to test/algorithms/set_operations/set_ops_pp.cpp
diff --git a/test/algorithms/set_operations/sym_difference/Jamfile.v2 b/test/algorithms/set_operations/sym_difference/Jamfile.v2
new file mode 100644
index 000000000..f64bb92ba
--- /dev/null
+++ b/test/algorithms/set_operations/sym_difference/Jamfile.v2
@@ -0,0 +1,20 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is 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)
+
+test-suite boost-geometry-algorithms-sym_difference
+    :
+    [ run sym_difference_linear_linear.cpp ]
+    ;
diff --git a/test/algorithms/sym_difference_linear_linear.cpp b/test/algorithms/set_operations/sym_difference/sym_difference_linear_linear.cpp
similarity index 100%
rename from test/algorithms/sym_difference_linear_linear.cpp
rename to test/algorithms/set_operations/sym_difference/sym_difference_linear_linear.cpp
diff --git a/test/algorithms/test_sym_difference_linear_linear.hpp b/test/algorithms/set_operations/sym_difference/test_sym_difference_linear_linear.hpp
similarity index 98%
rename from test/algorithms/test_sym_difference_linear_linear.hpp
rename to test/algorithms/set_operations/sym_difference/test_sym_difference_linear_linear.hpp
index 001c82bd8..69c82403e 100644
--- a/test/algorithms/test_sym_difference_linear_linear.hpp
+++ b/test/algorithms/set_operations/sym_difference/test_sym_difference_linear_linear.hpp
@@ -10,10 +10,10 @@
 #ifndef BOOST_GEOMETRY_TEST_SYM_DIFFERENCE_LINEAR_LINEAR_HPP
 #define BOOST_GEOMETRY_TEST_SYM_DIFFERENCE_LINEAR_LINEAR_HPP
 
-#include "from_wkt.hpp"
 #include <boost/geometry/geometry.hpp>
-#include "test_set_ops_linear_linear.hpp"
-#include "to_svg.hpp"
+#include "../test_set_ops_linear_linear.hpp"
+#include <from_wkt.hpp>
+#include <to_svg.hpp>
 
 
 //==================================================================
diff --git a/test/algorithms/test_get_turns_ll_invariance.hpp b/test/algorithms/set_operations/test_get_turns_ll_invariance.hpp
similarity index 100%
rename from test/algorithms/test_get_turns_ll_invariance.hpp
rename to test/algorithms/set_operations/test_get_turns_ll_invariance.hpp
diff --git a/test/algorithms/test_set_ops_linear_linear.hpp b/test/algorithms/set_operations/test_set_ops_linear_linear.hpp
similarity index 100%
rename from test/algorithms/test_set_ops_linear_linear.hpp
rename to test/algorithms/set_operations/test_set_ops_linear_linear.hpp
diff --git a/test/algorithms/test_set_ops_pl_pl.hpp b/test/algorithms/set_operations/test_set_ops_pl_pl.hpp
similarity index 99%
rename from test/algorithms/test_set_ops_pl_pl.hpp
rename to test/algorithms/set_operations/test_set_ops_pl_pl.hpp
index 63f363e52..fd825d003 100644
--- a/test/algorithms/test_set_ops_pl_pl.hpp
+++ b/test/algorithms/set_operations/test_set_ops_pl_pl.hpp
@@ -15,8 +15,8 @@
 
 namespace bg = ::boost::geometry;
 
-#include "from_wkt.hpp"
-#include "to_svg.hpp"
+#include <from_wkt.hpp>
+#include <to_svg.hpp>
 
 #include <algorithm>
 #include <fstream>
diff --git a/test/algorithms/set_operations/union/Jamfile.v2 b/test/algorithms/set_operations/union/Jamfile.v2
new file mode 100644
index 000000000..d4df3ea5c
--- /dev/null
+++ b/test/algorithms/set_operations/union/Jamfile.v2
@@ -0,0 +1,23 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+#
+# Use, modification and distribution is 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)
+
+test-suite boost-geometry-algorithms-union
+    :
+    [ run multi_union.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    [ run union.cpp                : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    [ run union_linear_linear.cpp ]
+    [ run union_pl_pl.cpp ]
+    ;
diff --git a/test/multi/algorithms/multi_union.cpp b/test/algorithms/set_operations/union/multi_union.cpp
similarity index 98%
rename from test/multi/algorithms/multi_union.cpp
rename to test/algorithms/set_operations/union/multi_union.cpp
index 2e1e309a6..b90459236 100644
--- a/test/multi/algorithms/multi_union.cpp
+++ b/test/algorithms/set_operations/union/multi_union.cpp
@@ -14,9 +14,9 @@
 // This multi_union currently contains no tests for double which then fail
 // #define BOOST_GEOMETRY_NO_ROBUSTNESS
 
-#include <algorithms/test_union.hpp>
+#include "test_union.hpp"
 #include <algorithms/test_overlay.hpp>
-#include <multi/algorithms/overlay/multi_overlay_cases.hpp>
+#include <algorithms/overlay/multi_overlay_cases.hpp>
 
 #include <boost/geometry/multi/algorithms/correct.hpp>
 #include <boost/geometry/multi/algorithms/intersection.hpp>
diff --git a/test/algorithms/test_union.hpp b/test/algorithms/set_operations/union/test_union.hpp
similarity index 100%
rename from test/algorithms/test_union.hpp
rename to test/algorithms/set_operations/union/test_union.hpp
diff --git a/test/algorithms/test_union_linear_linear.hpp b/test/algorithms/set_operations/union/test_union_linear_linear.hpp
similarity index 98%
rename from test/algorithms/test_union_linear_linear.hpp
rename to test/algorithms/set_operations/union/test_union_linear_linear.hpp
index c106a51c8..2fd16fbfb 100644
--- a/test/algorithms/test_union_linear_linear.hpp
+++ b/test/algorithms/set_operations/union/test_union_linear_linear.hpp
@@ -10,10 +10,10 @@
 #ifndef BOOST_GEOMETRY_TEST_UNION_LINEAR_LINEAR_HPP
 #define BOOST_GEOMETRY_TEST_UNION_LINEAR_LINEAR_HPP
 
-#include "from_wkt.hpp"
 #include <boost/geometry/geometry.hpp>
-#include "test_set_ops_linear_linear.hpp"
-#include "to_svg.hpp"
+#include "../test_set_ops_linear_linear.hpp"
+#include <from_wkt.hpp>
+#include <to_svg.hpp>
 
 
 //==================================================================
diff --git a/test/algorithms/union.cpp b/test/algorithms/set_operations/union/union.cpp
similarity index 99%
rename from test/algorithms/union.cpp
rename to test/algorithms/set_operations/union/union.cpp
index b5dfbf237..5be277cbf 100644
--- a/test/algorithms/union.cpp
+++ b/test/algorithms/set_operations/union/union.cpp
@@ -19,7 +19,7 @@
 // Test which would fail then are disabled automatically
 // #define BOOST_GEOMETRY_NO_ROBUSTNESS
 
-#include <algorithms/test_union.hpp>
+#include "test_union.hpp"
 #include <algorithms/test_overlay.hpp>
 
 #include <algorithms/overlay/overlay_cases.hpp>
diff --git a/test/algorithms/union_linear_linear.cpp b/test/algorithms/set_operations/union/union_linear_linear.cpp
similarity index 100%
rename from test/algorithms/union_linear_linear.cpp
rename to test/algorithms/set_operations/union/union_linear_linear.cpp
diff --git a/test/algorithms/union_pl_pl.cpp b/test/algorithms/set_operations/union/union_pl_pl.cpp
similarity index 99%
rename from test/algorithms/union_pl_pl.cpp
rename to test/algorithms/set_operations/union/union_pl_pl.cpp
index 160d86646..05be9f1f6 100644
--- a/test/algorithms/union_pl_pl.cpp
+++ b/test/algorithms/set_operations/union/union_pl_pl.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/test/included/unit_test.hpp>
 
-#include "test_set_ops_pl_pl.hpp"
+#include "../test_set_ops_pl_pl.hpp"
 
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 
diff --git a/test/algorithms/from_wkt.hpp b/test/from_wkt.hpp
similarity index 100%
rename from test/algorithms/from_wkt.hpp
rename to test/from_wkt.hpp
diff --git a/test/multi/io/dsv/Jamfile.v2 b/test/io/dsv/Jamfile.v2
similarity index 92%
rename from test/multi/io/dsv/Jamfile.v2
rename to test/io/dsv/Jamfile.v2
index 1a855ae27..73d818db7 100644
--- a/test/multi/io/dsv/Jamfile.v2
+++ b/test/io/dsv/Jamfile.v2
@@ -8,7 +8,7 @@
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-test-suite boost-geometry-multi-io-dsv
+test-suite boost-geometry-io-dsv
     :
     [ run multi_dsv.cpp ]
     ;
diff --git a/test/multi/io/dsv/multi_dsv.cpp b/test/io/dsv/multi_dsv.cpp
similarity index 100%
rename from test/multi/io/dsv/multi_dsv.cpp
rename to test/io/dsv/multi_dsv.cpp
diff --git a/test/io/wkt/Jamfile.v2 b/test/io/wkt/Jamfile.v2
index c93e26a8e..27813bbf6 100644
--- a/test/io/wkt/Jamfile.v2
+++ b/test/io/wkt/Jamfile.v2
@@ -10,6 +10,7 @@
 
 test-suite boost-geometry-io-wkt
     :
+    [ run multi_wkt.cpp ]
     [ run wkt.cpp ]
     ;
 
diff --git a/test/multi/io/wkt/multi_wkt.cpp b/test/io/wkt/multi_wkt.cpp
similarity index 100%
rename from test/multi/io/wkt/multi_wkt.cpp
rename to test/io/wkt/multi_wkt.cpp
diff --git a/test/multi/Jamfile.v2 b/test/multi/Jamfile.v2
deleted file mode 100644
index b38d8c5ad..000000000
--- a/test/multi/Jamfile.v2
+++ /dev/null
@@ -1,12 +0,0 @@
-# Boost.Geometry (aka GGL, Generic Geometry Library)
-#
-# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-#
-# Use, modification and distribution is 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)
-
-build-project algorithms ;
-build-project io ;
\ No newline at end of file
diff --git a/test/multi/algorithms/Jamfile.v2 b/test/multi/algorithms/Jamfile.v2
deleted file mode 100644
index ef1d6b2c8..000000000
--- a/test/multi/algorithms/Jamfile.v2
+++ /dev/null
@@ -1,42 +0,0 @@
-# Boost.Geometry (aka GGL, Generic Geometry Library)
-#
-# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
-# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
-# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
-#
-# Use, modification and distribution is 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)
-
-test-suite boost-geometry-multi-algorithms
-    :
-    [ run multi_area.cpp ]
-    [ run multi_centroid.cpp ]
-    [ run multi_convert.cpp ]
-    [ run multi_convex_hull.cpp ]
-    [ run multi_correct.cpp ]
-    [ run multi_covered_by.cpp ]
-    [ run multi_difference.cpp  : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run multi_difference_spike.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run multi_disjoint.cpp ]
-    [ run multi_envelope.cpp ]
-    [ run multi_equals.cpp ]
-    [ run multi_for_each.cpp ]
-    [ run multi_intersection.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run multi_intersects.cpp ]
-    [ run multi_length.cpp ]
-    [ run multi_num_geometries.cpp ]
-    [ run multi_num_interior_rings.cpp ]
-    [ run multi_num_points.cpp ]
-    [ run multi_perimeter.cpp ]
-    [ run multi_reverse.cpp ]
-    [ run multi_simplify.cpp ]
-    [ run multi_touches.cpp ]
-    [ run multi_transform.cpp ]
-    [ run multi_union.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run multi_unique.cpp ]
-    [ run multi_within.cpp ]
-    ;
-
-build-project overlay 
-    ;
diff --git a/test/multi/algorithms/overlay/Jamfile.v2 b/test/multi/algorithms/overlay/Jamfile.v2
deleted file mode 100644
index 2ea7594e1..000000000
--- a/test/multi/algorithms/overlay/Jamfile.v2
+++ /dev/null
@@ -1,14 +0,0 @@
-# Boost.Geometry (aka GGL, Generic Geometry Library)
-#
-# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-#
-# Use, modification and distribution is 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)
-
-test-suite boost-geometry-multi-algorithms-overlay
-    : 
-    [ run multi_traverse.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <define>BOOST_GEOMETRY_RESCALE_TO_ROBUST ]
-     ;
diff --git a/test/multi/io/Jamfile.v2 b/test/multi/io/Jamfile.v2
deleted file mode 100644
index 6985a7ab9..000000000
--- a/test/multi/io/Jamfile.v2
+++ /dev/null
@@ -1,12 +0,0 @@
-# Boost.Geometry (aka GGL, Generic Geometry Library)
-#
-# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-#
-# Use, modification and distribution is 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)
-
-build-project wkt ; 
-build-project dsv ; 
diff --git a/test/multi/io/wkt/Jamfile.v2 b/test/multi/io/wkt/Jamfile.v2
deleted file mode 100644
index 50c17cf68..000000000
--- a/test/multi/io/wkt/Jamfile.v2
+++ /dev/null
@@ -1,15 +0,0 @@
-# Boost.Geometry (aka GGL, Generic Geometry Library)
-#
-# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-#
-# Use, modification and distribution is 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)
-
-test-suite boost-geometry-multi-io-wkt
-    :
-    [ run multi_wkt.cpp ]
-    ;
-