diff --git a/test/porousmediumflow/2p/implicit/CMakeLists.txt b/test/porousmediumflow/2p/implicit/CMakeLists.txt
index b32b5495d7ee09e1249a4e8ea2b90094cd204445..b18c82cdbfb9e845d52c5cee9ba8922cf4253df7 100644
--- a/test/porousmediumflow/2p/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(adaptive)
+add_subdirectory(boxdfm)
 add_subdirectory(fracture)
 add_subdirectory(incompressible)
 add_subdirectory(nonisothermal)
diff --git a/test/porousmediumflow/boxdfm/2p/CMakeLists.txt b/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/boxdfm/2p/CMakeLists.txt
rename to test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
diff --git a/test/porousmediumflow/boxdfm/2p/grids/2d_quads.msh b/test/porousmediumflow/2p/implicit/boxdfm/grids/2d_quads.msh
similarity index 100%
rename from test/porousmediumflow/boxdfm/2p/grids/2d_quads.msh
rename to test/porousmediumflow/2p/implicit/boxdfm/grids/2d_quads.msh
diff --git a/test/porousmediumflow/boxdfm/2p/grids/2d_trias.msh b/test/porousmediumflow/2p/implicit/boxdfm/grids/2d_trias.msh
similarity index 100%
rename from test/porousmediumflow/boxdfm/2p/grids/2d_trias.msh
rename to test/porousmediumflow/2p/implicit/boxdfm/grids/2d_trias.msh
diff --git a/test/porousmediumflow/boxdfm/2p/grids/3d_simplex.msh b/test/porousmediumflow/2p/implicit/boxdfm/grids/3d_simplex.msh
similarity index 100%
rename from test/porousmediumflow/boxdfm/2p/grids/3d_simplex.msh
rename to test/porousmediumflow/2p/implicit/boxdfm/grids/3d_simplex.msh
diff --git a/test/porousmediumflow/boxdfm/2p/problem.hh b/test/porousmediumflow/2p/implicit/boxdfm/problem.hh
similarity index 100%
rename from test/porousmediumflow/boxdfm/2p/problem.hh
rename to test/porousmediumflow/2p/implicit/boxdfm/problem.hh
diff --git a/test/porousmediumflow/boxdfm/2p/spatialparams.hh b/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/boxdfm/2p/spatialparams.hh
rename to test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh
diff --git a/test/porousmediumflow/boxdfm/2p/test_2p.input b/test/porousmediumflow/2p/implicit/boxdfm/test_2p.input
similarity index 100%
rename from test/porousmediumflow/boxdfm/2p/test_2p.input
rename to test/porousmediumflow/2p/implicit/boxdfm/test_2p.input
diff --git a/test/porousmediumflow/boxdfm/2p/test_2pboxdfm.cc b/test/porousmediumflow/2p/implicit/boxdfm/test_2pboxdfm.cc
similarity index 100%
rename from test/porousmediumflow/boxdfm/2p/test_2pboxdfm.cc
rename to test/porousmediumflow/2p/implicit/boxdfm/test_2pboxdfm.cc
diff --git a/test/porousmediumflow/CMakeLists.txt b/test/porousmediumflow/CMakeLists.txt
index 42cf1b4e6f9194bc082756a98e1067fe47582ad3..01e037dd075bce308f99d4b3647304f9031991e7 100644
--- a/test/porousmediumflow/CMakeLists.txt
+++ b/test/porousmediumflow/CMakeLists.txt
@@ -9,7 +9,6 @@ add_subdirectory("2pncmin")
 add_subdirectory("3p")
 add_subdirectory("3p3c")
 add_subdirectory("3pwateroil")
-add_subdirectory("boxdfm")
 add_subdirectory("co2")
 add_subdirectory("mpnc")
 add_subdirectory("richards")
diff --git a/test/porousmediumflow/boxdfm/CMakeLists.txt b/test/porousmediumflow/boxdfm/CMakeLists.txt
deleted file mode 100644
index c2979549d1373034f25ec527493ab189ab0097e4..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/boxdfm/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory("2p")