diff --git a/test/porousmediumflow/2p1c/CMakeLists.txt b/test/porousmediumflow/2p1c/CMakeLists.txt
index 52318c8c0846044f9f8be3725616d8b529e77697..c0c79aeec09175e52d4c4cd69beb648fc8c2a53b 100644
--- a/test/porousmediumflow/2p1c/CMakeLists.txt
+++ b/test/porousmediumflow/2p1c/CMakeLists.txt
@@ -1 +1,48 @@
-add_subdirectory(implicit)
+#add links to input files
+add_input_file_links()
+
+add_executable(test_2p1cni_steaminjection_tpfa EXCLUDE_FROM_ALL main.cc)
+target_compile_definitions(test_2p1cni_steaminjection_tpfa PUBLIC "TYPETAG=TwoPOneCNICCTpfa")
+
+add_executable(test_2p1cni_steaminjection_box EXCLUDE_FROM_ALL main.cc)
+target_compile_definitions(test_2p1cni_steaminjection_box PUBLIC "TYPETAG=TwoPOneCNIBox")
+
+dumux_add_test(NAME test_2p1cni_steaminjection_waterwet_box
+ LABELS porousmediumflow 2p1c 2p1cni
+ TARGET test_2p1cni_steaminjection_box
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_waterwet_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_waterwet_box-00007.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_box params_box.input -Problem.Name test_2p1cni_steaminjection_waterwet_box")
+
+dumux_add_test(NAME test_2p1cni_steaminjection_waterwet_tpfa
+ LABELS porousmediumflow 2p1c 2p1cni
+ TARGET test_2p1cni_steaminjection_tpfa
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_waterwet_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_waterwet_tpfa-00009.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_tpfa params_tpfa.input -Problem.Name test_2p1cni_steaminjection_waterwet_tpfa")
+
+dumux_add_test(NAME test_2p1cni_steaminjection_gaswet_box
+ LABELS porousmediumflow 2p1c 2p1cni
+ TARGET test_2p1cni_steaminjection_box
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_gaswet_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_gaswet_box-00005.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_box params_box.input
+ -Problem.Name test_2p1cni_steaminjection_gaswet_box
+ -SpatialParams.GasWetting true")
+
+dumux_add_test(NAME test_2p1cni_steaminjection_gaswet_tpfa
+ LABELS porousmediumflow 2p1c 2p1cni
+ TARGET test_2p1cni_steaminjection_tpfa
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_gaswet_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_gaswet_tpfa-00005.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_tpfa params_tpfa.input
+ -Problem.Name test_2p1cni_steaminjection_gaswet_tpfa
+ -SpatialParams.GasWetting true")
diff --git a/test/porousmediumflow/2p1c/implicit/CMakeLists.txt b/test/porousmediumflow/2p1c/implicit/CMakeLists.txt
deleted file mode 100644
index c0c79aeec09175e52d4c4cd69beb648fc8c2a53b..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p1c/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-#add links to input files
-add_input_file_links()
-
-add_executable(test_2p1cni_steaminjection_tpfa EXCLUDE_FROM_ALL main.cc)
-target_compile_definitions(test_2p1cni_steaminjection_tpfa PUBLIC "TYPETAG=TwoPOneCNICCTpfa")
-
-add_executable(test_2p1cni_steaminjection_box EXCLUDE_FROM_ALL main.cc)
-target_compile_definitions(test_2p1cni_steaminjection_box PUBLIC "TYPETAG=TwoPOneCNIBox")
-
-dumux_add_test(NAME test_2p1cni_steaminjection_waterwet_box
- LABELS porousmediumflow 2p1c 2p1cni
- TARGET test_2p1cni_steaminjection_box
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_waterwet_box-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_waterwet_box-00007.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_box params_box.input -Problem.Name test_2p1cni_steaminjection_waterwet_box")
-
-dumux_add_test(NAME test_2p1cni_steaminjection_waterwet_tpfa
- LABELS porousmediumflow 2p1c 2p1cni
- TARGET test_2p1cni_steaminjection_tpfa
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_waterwet_tpfa-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_waterwet_tpfa-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_tpfa params_tpfa.input -Problem.Name test_2p1cni_steaminjection_waterwet_tpfa")
-
-dumux_add_test(NAME test_2p1cni_steaminjection_gaswet_box
- LABELS porousmediumflow 2p1c 2p1cni
- TARGET test_2p1cni_steaminjection_box
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_gaswet_box-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_gaswet_box-00005.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_box params_box.input
- -Problem.Name test_2p1cni_steaminjection_gaswet_box
- -SpatialParams.GasWetting true")
-
-dumux_add_test(NAME test_2p1cni_steaminjection_gaswet_tpfa
- LABELS porousmediumflow 2p1c 2p1cni
- TARGET test_2p1cni_steaminjection_tpfa
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_2p1cni_steaminjection_gaswet_tpfa-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_gaswet_tpfa-00005.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_tpfa params_tpfa.input
- -Problem.Name test_2p1cni_steaminjection_gaswet_tpfa
- -SpatialParams.GasWetting true")
diff --git a/test/porousmediumflow/2p1c/implicit/main.cc b/test/porousmediumflow/2p1c/main.cc
similarity index 100%
rename from test/porousmediumflow/2p1c/implicit/main.cc
rename to test/porousmediumflow/2p1c/main.cc
diff --git a/test/porousmediumflow/2p1c/implicit/params_box.input b/test/porousmediumflow/2p1c/params_box.input
similarity index 100%
rename from test/porousmediumflow/2p1c/implicit/params_box.input
rename to test/porousmediumflow/2p1c/params_box.input
diff --git a/test/porousmediumflow/2p1c/implicit/params_tpfa.input b/test/porousmediumflow/2p1c/params_tpfa.input
similarity index 100%
rename from test/porousmediumflow/2p1c/implicit/params_tpfa.input
rename to test/porousmediumflow/2p1c/params_tpfa.input
diff --git a/test/porousmediumflow/2p1c/implicit/problem.hh b/test/porousmediumflow/2p1c/problem.hh
similarity index 100%
rename from test/porousmediumflow/2p1c/implicit/problem.hh
rename to test/porousmediumflow/2p1c/problem.hh
diff --git a/test/porousmediumflow/2p1c/implicit/spatialparams.hh b/test/porousmediumflow/2p1c/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2p1c/implicit/spatialparams.hh
rename to test/porousmediumflow/2p1c/spatialparams.hh