diff --git a/test/porousmediumflow/2pncmin/CMakeLists.txt b/test/porousmediumflow/2pncmin/CMakeLists.txt
index 52318c8c0846044f9f8be3725616d8b529e77697..bc7eb9a410f5506335f56ed64b442d7de9fb3b2f 100644
--- a/test/porousmediumflow/2pncmin/CMakeLists.txt
+++ b/test/porousmediumflow/2pncmin/CMakeLists.txt
@@ -1 +1,2 @@
-add_subdirectory(implicit)
+add_subdirectory(isothermal)
+add_subdirectory(nonisothermal)
diff --git a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
deleted file mode 100644
index bc7eb9a410f5506335f56ed64b442d7de9fb3b2f..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(isothermal)
-add_subdirectory(nonisothermal)
diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/CMakeLists.txt b/test/porousmediumflow/2pncmin/isothermal/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2pncmin/implicit/isothermal/CMakeLists.txt
rename to test/porousmediumflow/2pncmin/isothermal/CMakeLists.txt
diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/main.cc b/test/porousmediumflow/2pncmin/isothermal/main.cc
similarity index 100%
rename from test/porousmediumflow/2pncmin/implicit/isothermal/main.cc
rename to test/porousmediumflow/2pncmin/isothermal/main.cc
diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/params.input b/test/porousmediumflow/2pncmin/isothermal/params.input
similarity index 100%
rename from test/porousmediumflow/2pncmin/implicit/isothermal/params.input
rename to test/porousmediumflow/2pncmin/isothermal/params.input
diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh b/test/porousmediumflow/2pncmin/isothermal/problem.hh
similarity index 100%
rename from test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh
rename to test/porousmediumflow/2pncmin/isothermal/problem.hh
diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh b/test/porousmediumflow/2pncmin/isothermal/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh
rename to test/porousmediumflow/2pncmin/isothermal/spatialparams.hh
diff --git a/test/porousmediumflow/2pncmin/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/2pncmin/nonisothermal/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2pncmin/implicit/nonisothermal/CMakeLists.txt
rename to test/porousmediumflow/2pncmin/nonisothermal/CMakeLists.txt
diff --git a/test/porousmediumflow/2pncmin/implicit/nonisothermal/main.cc b/test/porousmediumflow/2pncmin/nonisothermal/main.cc
similarity index 100%
rename from test/porousmediumflow/2pncmin/implicit/nonisothermal/main.cc
rename to test/porousmediumflow/2pncmin/nonisothermal/main.cc
diff --git a/test/porousmediumflow/2pncmin/implicit/nonisothermal/params.input b/test/porousmediumflow/2pncmin/nonisothermal/params.input
similarity index 100%
rename from test/porousmediumflow/2pncmin/implicit/nonisothermal/params.input
rename to test/porousmediumflow/2pncmin/nonisothermal/params.input
diff --git a/test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2pncmin/nonisothermal/problem.hh
similarity index 100%
rename from test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh
rename to test/porousmediumflow/2pncmin/nonisothermal/problem.hh
diff --git a/test/porousmediumflow/2pncmin/implicit/nonisothermal/spatialparams.hh b/test/porousmediumflow/2pncmin/nonisothermal/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2pncmin/implicit/nonisothermal/spatialparams.hh
rename to test/porousmediumflow/2pncmin/nonisothermal/spatialparams.hh