diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9cec5e3ff866b7f0fa7cd8f49b96a4873354d95f..b6d855fcc0dcabd9bc4072ab6c4d1a76bba629f0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory(common)
 add_subdirectory(geomechanics)
+add_subdirectory(geometry)
 add_subdirectory(flux)
 add_subdirectory(freeflow)
 add_subdirectory(io)
diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt
index 80146db8c5a314ffa848258085b72f327ca779b1..68b481a963e0e524456015771aa2e1d31662a037 100644
--- a/test/common/CMakeLists.txt
+++ b/test/common/CMakeLists.txt
@@ -1,6 +1,4 @@
-add_subdirectory(boundingboxtree)
 add_subdirectory(functions)
-add_subdirectory(geometry)
 add_subdirectory(integrate)
 add_subdirectory(math)
 add_subdirectory(parameters)
diff --git a/test/common/geometry/CMakeLists.txt b/test/geometry/CMakeLists.txt
similarity index 97%
rename from test/common/geometry/CMakeLists.txt
rename to test/geometry/CMakeLists.txt
index 6e57be7f6d0a318670f5bbc84edc0d64000ddcc0..5e5c273e27c52f628e79f3052dc7226dc1f5305e 100644
--- a/test/common/geometry/CMakeLists.txt
+++ b/test/geometry/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(boundingboxtree)
+
 dumux_add_test(SOURCES test_0d1d_intersection.cc LABELS unit)
 dumux_add_test(SOURCES test_0d2d_intersection.cc LABELS unit)
 dumux_add_test(SOURCES test_0d3d_intersection.cc LABELS unit)
@@ -12,11 +14,9 @@ dumux_add_test(SOURCES test_graham_convex_hull.cc LABELS unit)
 dumux_add_test(SOURCES test_intersectingentity_cartesiangrid.cc LABELS unit)
 dumux_add_test(SOURCES test_circlepoints.cc LABELS unit)
 dumux_add_test(SOURCES test_cylinderintegration.cc LABELS unit)
-
+dumux_add_test(SOURCES test_makegeometry.cc LABELS unit)
+dumux_add_test(SOURCES test_refinementquadraturerule.cc LABELS unit)
 dune_symlink_to_source_files(FILES ball.msh)
 dumux_add_test(SOURCES test_intersectionentityset.cc
                CMAKE_GUARD dune-alugrid_FOUND
                LABELS unit)
-
-dumux_add_test(SOURCES test_makegeometry.cc LABELS unit)
-dumux_add_test(SOURCES test_refinementquadraturerule.cc LABELS unit)
diff --git a/test/common/geometry/ball.geo b/test/geometry/ball.geo
similarity index 100%
rename from test/common/geometry/ball.geo
rename to test/geometry/ball.geo
diff --git a/test/common/geometry/ball.msh b/test/geometry/ball.msh
similarity index 100%
rename from test/common/geometry/ball.msh
rename to test/geometry/ball.msh
diff --git a/test/common/boundingboxtree/CMakeLists.txt b/test/geometry/boundingboxtree/CMakeLists.txt
similarity index 100%
rename from test/common/boundingboxtree/CMakeLists.txt
rename to test/geometry/boundingboxtree/CMakeLists.txt
diff --git a/test/common/boundingboxtree/fracture.msh b/test/geometry/boundingboxtree/fracture.msh
similarity index 100%
rename from test/common/boundingboxtree/fracture.msh
rename to test/geometry/boundingboxtree/fracture.msh
diff --git a/test/common/boundingboxtree/network1d.geo b/test/geometry/boundingboxtree/network1d.geo
similarity index 100%
rename from test/common/boundingboxtree/network1d.geo
rename to test/geometry/boundingboxtree/network1d.geo
diff --git a/test/common/boundingboxtree/network1d.msh b/test/geometry/boundingboxtree/network1d.msh
similarity index 100%
rename from test/common/boundingboxtree/network1d.msh
rename to test/geometry/boundingboxtree/network1d.msh
diff --git a/test/common/boundingboxtree/network2d.geo b/test/geometry/boundingboxtree/network2d.geo
similarity index 100%
rename from test/common/boundingboxtree/network2d.geo
rename to test/geometry/boundingboxtree/network2d.geo
diff --git a/test/common/boundingboxtree/network2d.msh b/test/geometry/boundingboxtree/network2d.msh
similarity index 100%
rename from test/common/boundingboxtree/network2d.msh
rename to test/geometry/boundingboxtree/network2d.msh
diff --git a/test/common/boundingboxtree/test_bboxtree.cc b/test/geometry/boundingboxtree/test_bboxtree.cc
similarity index 99%
rename from test/common/boundingboxtree/test_bboxtree.cc
rename to test/geometry/boundingboxtree/test_bboxtree.cc
index 9c6066f7f27119c87195502ac28950a4035db2a6..d2744fb643e7f75388e17faa418124c0dc8cfc08 100644
--- a/test/common/boundingboxtree/test_bboxtree.cc
+++ b/test/geometry/boundingboxtree/test_bboxtree.cc
@@ -19,7 +19,7 @@
 #include <dumux/common/geometry/boundingboxtree.hh>
 #include <dumux/common/geometry/geometricentityset.hh>
 #include <dumux/common/geometry/intersectingentities.hh>
-#include <test/common/geometry/writetriangulation.hh>
+#include "../writetriangulation.hh"
 
 namespace Dumux {
 
diff --git a/test/common/boundingboxtree/test_geometry_fracture.cc b/test/geometry/boundingboxtree/test_geometry_fracture.cc
similarity index 100%
rename from test/common/boundingboxtree/test_geometry_fracture.cc
rename to test/geometry/boundingboxtree/test_geometry_fracture.cc
diff --git a/test/common/geometry/test_0d1d_intersection.cc b/test/geometry/test_0d1d_intersection.cc
similarity index 100%
rename from test/common/geometry/test_0d1d_intersection.cc
rename to test/geometry/test_0d1d_intersection.cc
diff --git a/test/common/geometry/test_0d2d_intersection.cc b/test/geometry/test_0d2d_intersection.cc
similarity index 100%
rename from test/common/geometry/test_0d2d_intersection.cc
rename to test/geometry/test_0d2d_intersection.cc
diff --git a/test/common/geometry/test_0d3d_intersection.cc b/test/geometry/test_0d3d_intersection.cc
similarity index 100%
rename from test/common/geometry/test_0d3d_intersection.cc
rename to test/geometry/test_0d3d_intersection.cc
diff --git a/test/common/geometry/test_1d1d_intersection.cc b/test/geometry/test_1d1d_intersection.cc
similarity index 100%
rename from test/common/geometry/test_1d1d_intersection.cc
rename to test/geometry/test_1d1d_intersection.cc
diff --git a/test/common/geometry/test_1d2d_intersection.cc b/test/geometry/test_1d2d_intersection.cc
similarity index 99%
rename from test/common/geometry/test_1d2d_intersection.cc
rename to test/geometry/test_1d2d_intersection.cc
index 50b34e2542f19970e8c4d9109e2fd292b0f28fbb..040a0b87f531d99db64d8f7740e72b4dbd7fcfd2 100644
--- a/test/common/geometry/test_1d2d_intersection.cc
+++ b/test/geometry/test_1d2d_intersection.cc
@@ -12,7 +12,6 @@
 
 #include <dumux/common/geometry/geometryintersection.hh>
 
-
 #ifndef DOXYGEN
 Dune::MultiLinearGeometry<double, 1, 2>
 makeLine(std::initializer_list<Dune::FieldVector<double, 2>>&& c, std::integral_constant<int, 2>)
diff --git a/test/common/geometry/test_1d3d_intersection.cc b/test/geometry/test_1d3d_intersection.cc
similarity index 100%
rename from test/common/geometry/test_1d3d_intersection.cc
rename to test/geometry/test_1d3d_intersection.cc
diff --git a/test/common/geometry/test_2d2d_intersection.cc b/test/geometry/test_2d2d_intersection.cc
similarity index 100%
rename from test/common/geometry/test_2d2d_intersection.cc
rename to test/geometry/test_2d2d_intersection.cc
diff --git a/test/common/geometry/test_2d3d_intersection.cc b/test/geometry/test_2d3d_intersection.cc
similarity index 98%
rename from test/common/geometry/test_2d3d_intersection.cc
rename to test/geometry/test_2d3d_intersection.cc
index 0b94c645c35ce30842ea3a39bbd1a146bb082203..97ec0d872d4bc87fcb26d3700d9c566c3447889b 100644
--- a/test/common/geometry/test_2d3d_intersection.cc
+++ b/test/geometry/test_2d3d_intersection.cc
@@ -12,7 +12,7 @@
 
 #include <dumux/common/geometry/geometryintersection.hh>
 #include <dumux/common/geometry/triangulation.hh>
-#include <test/common/geometry/writetriangulation.hh>
+#include "writetriangulation.hh"
 
 template<int dimworld = 3>
 void testSegTriangle(const Dune::FieldVector<double, dimworld>& a,
diff --git a/test/common/geometry/test_circlepoints.cc b/test/geometry/test_circlepoints.cc
similarity index 100%
rename from test/common/geometry/test_circlepoints.cc
rename to test/geometry/test_circlepoints.cc
diff --git a/test/common/geometry/test_cylinderintegration.cc b/test/geometry/test_cylinderintegration.cc
similarity index 100%
rename from test/common/geometry/test_cylinderintegration.cc
rename to test/geometry/test_cylinderintegration.cc
diff --git a/test/common/geometry/test_distance.cc b/test/geometry/test_distance.cc
similarity index 100%
rename from test/common/geometry/test_distance.cc
rename to test/geometry/test_distance.cc
diff --git a/test/common/geometry/test_graham_convex_hull.cc b/test/geometry/test_graham_convex_hull.cc
similarity index 98%
rename from test/common/geometry/test_graham_convex_hull.cc
rename to test/geometry/test_graham_convex_hull.cc
index a59029cc12325393b8006727d82baa7f400cedbb..d6b5487cb1d2d031e9972d5482efd04b24ba068f 100644
--- a/test/common/geometry/test_graham_convex_hull.cc
+++ b/test/geometry/test_graham_convex_hull.cc
@@ -15,7 +15,8 @@
 #include <dumux/common/math.hh>
 #include <dumux/common/geometry/triangulation.hh>
 #include <dumux/common/geometry/grahamconvexhull.hh>
-#include <test/common/geometry/writetriangulation.hh>
+
+#include "writetriangulation.hh"
 
 template<class Scalar>
 class UniformDistributedRandomNumber
diff --git a/test/common/geometry/test_intersectingentity_cartesiangrid.cc b/test/geometry/test_intersectingentity_cartesiangrid.cc
similarity index 100%
rename from test/common/geometry/test_intersectingentity_cartesiangrid.cc
rename to test/geometry/test_intersectingentity_cartesiangrid.cc
diff --git a/test/common/geometry/test_intersection.hh b/test/geometry/test_intersection.hh
similarity index 100%
rename from test/common/geometry/test_intersection.hh
rename to test/geometry/test_intersection.hh
diff --git a/test/common/geometry/test_intersectionentityset.cc b/test/geometry/test_intersectionentityset.cc
similarity index 100%
rename from test/common/geometry/test_intersectionentityset.cc
rename to test/geometry/test_intersectionentityset.cc
diff --git a/test/common/geometry/test_makegeometry.cc b/test/geometry/test_makegeometry.cc
similarity index 100%
rename from test/common/geometry/test_makegeometry.cc
rename to test/geometry/test_makegeometry.cc
diff --git a/test/common/geometry/test_normal.cc b/test/geometry/test_normal.cc
similarity index 100%
rename from test/common/geometry/test_normal.cc
rename to test/geometry/test_normal.cc
diff --git a/test/common/geometry/test_refinementquadraturerule.cc b/test/geometry/test_refinementquadraturerule.cc
similarity index 100%
rename from test/common/geometry/test_refinementquadraturerule.cc
rename to test/geometry/test_refinementquadraturerule.cc
index 7511e351a67b87cdce9bd712de69bb261cee1955..411b8fe3f17d2044e705d0bb149fbe36c8bbff12 100644
--- a/test/common/geometry/test_refinementquadraturerule.cc
+++ b/test/geometry/test_refinementquadraturerule.cc
@@ -6,8 +6,8 @@
 #include <dune/common/fvector.hh>
 #include <dune/common/exceptions.hh>
 #include <dune/common/float_cmp.hh>
-#include <dumux/common/geometry/refinementquadraturerule.hh>
 #include <dune/geometry/affinegeometry.hh>
+#include <dumux/common/geometry/refinementquadraturerule.hh>
 
 int main (int argc, char *argv[]) try
 {
diff --git a/test/common/geometry/transformation.hh b/test/geometry/transformation.hh
similarity index 100%
rename from test/common/geometry/transformation.hh
rename to test/geometry/transformation.hh
diff --git a/test/common/geometry/writetriangulation.hh b/test/geometry/writetriangulation.hh
similarity index 100%
rename from test/common/geometry/writetriangulation.hh
rename to test/geometry/writetriangulation.hh