diff --git a/test/algorithms/similarity/discrete_frechet_distance.cpp b/test/algorithms/similarity/discrete_frechet_distance.cpp
index 33578497f..35e552585 100644
--- a/test/algorithms/similarity/discrete_frechet_distance.cpp
+++ b/test/algorithms/similarity/discrete_frechet_distance.cpp
@@ -10,14 +10,12 @@
 
 #include <vector>
 
-
-#include <algorithms/test_frechet_distance.hpp>
-
-#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
+#include "test_frechet_distance.hpp"
+
     template <typename P>
 void test_all_cartesian()
 {
diff --git a/test/algorithms/similarity/discrete_hausdorff_distance.cpp b/test/algorithms/similarity/discrete_hausdorff_distance.cpp
index 5cc2cafbc..15659fc69 100644
--- a/test/algorithms/similarity/discrete_hausdorff_distance.cpp
+++ b/test/algorithms/similarity/discrete_hausdorff_distance.cpp
@@ -10,14 +10,12 @@
 
 #include <vector>
 
-
-#include <algorithms/test_hausdorff_distance.hpp>
-
-#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
+#include "test_hausdorff_distance.hpp"
+
     template <typename P>
 void test_all_cartesian()
 {
diff --git a/test/algorithms/test_frechet_distance.hpp b/test/algorithms/similarity/test_frechet_distance.hpp
similarity index 100%
rename from test/algorithms/test_frechet_distance.hpp
rename to test/algorithms/similarity/test_frechet_distance.hpp
diff --git a/test/algorithms/test_hausdorff_distance.hpp b/test/algorithms/similarity/test_hausdorff_distance.hpp
similarity index 100%
rename from test/algorithms/test_hausdorff_distance.hpp
rename to test/algorithms/similarity/test_hausdorff_distance.hpp