diff --git a/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt b/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt
index b65a2eeb7d812c92642e4669b6bb3b515b332895..79466ced7fd2c36c71b173475085a6dd6d5f0557 100644
--- a/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt
@@ -1,21 +1 @@
-add_input_file_links()
-
-dune_add_test(NAME test_1pncminni_box
-              SOURCES test_1pncminni_fv.cc
-              COMPILE_DEFINITIONS TYPETAG=ThermoChemBox
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/test_1pncmin-00064_batch.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/1pncmintest_batch_box-00065.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncminni_box test_1pncminni_fv.input -Problem.Name 1pncmintest_batch_box"
-                        --zeroThreshold {"precipVolFrac_CaOH2":5e-6})
-
-#install sources
-install(FILES
-modifiedcao.hh
-modifiedsteamn2cao2h2.hh
-thermochemproblem.hh
-thermochemspatialparams.hh
-thermochemreaction.hh
-test_1pncminni_fv.cc
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/1pncmin)
+add_subdirectory("nonisothermal")
diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0f9f73e76b25aa69c333206c545c203cae38bb92
--- /dev/null
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_input_file_links()
+
+dune_add_test(NAME test_1pncminni_box
+              SOURCES main.cc
+              COMPILE_DEFINITIONS TYPETAG=ThermoChemBox
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS  --script fuzzy
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_1pncminni_box-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_1pncminni_box-00065.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncminni_box params.input -Problem.Name test_1pncminni_box"
+                        --zeroThreshold {"precipVolFrac_CaOH2":5e-6})
+
+#install sources
+install(FILES
+modifiedcao.hh
+problem.hh
+spatialparams.hh
+reaction.hh
+main.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/1pncmin/implicit/nonisothermal)
diff --git a/test/porousmediumflow/1pncmin/implicit/test_1pncminni_fv.cc b/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc
similarity index 99%
rename from test/porousmediumflow/1pncmin/implicit/test_1pncminni_fv.cc
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc
index d6218e01444974492bfd4848360d92b978038723..ca43aac3566ff0ecbf143f2a67e53d28156247c4 100644
--- a/test/porousmediumflow/1pncmin/implicit/test_1pncminni_fv.cc
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc
@@ -38,7 +38,7 @@
 #include <dumux/io/vtkoutputmodule.hh>
 #include <dumux/io/grid/gridmanager.hh>
 
-#include "thermochemproblem.hh"
+#include "problem.hh"
 
 /*!
  * \brief Provides an interface for customizing error messages associated with
diff --git a/test/porousmediumflow/1pncmin/implicit/modifiedcao.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/modifiedcao.hh
similarity index 100%
rename from test/porousmediumflow/1pncmin/implicit/modifiedcao.hh
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/modifiedcao.hh
diff --git a/test/porousmediumflow/1pncmin/implicit/test_1pncminni_fv.input b/test/porousmediumflow/1pncmin/implicit/nonisothermal/params.input
similarity index 100%
rename from test/porousmediumflow/1pncmin/implicit/test_1pncminni_fv.input
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/params.input
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
similarity index 99%
rename from test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
index 3da3bb8f1ab34269fda03f279ba51ae93da21fda..d5c25b0c48ec77abcfc3d1246f729bb0f5df7d00 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
@@ -38,8 +38,8 @@
 #include <dumux/material/components/cao2h2.hh>
 #include <dumux/material/solidsystems/compositionalsolidphase.hh>
 
-#include "thermochemspatialparams.hh"
-#include "thermochemreaction.hh"
+#include "spatialparams.hh"
+#include "reaction.hh"
 #include "modifiedcao.hh"
 
 namespace Dumux {
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemreaction.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/reaction.hh
similarity index 100%
rename from test/porousmediumflow/1pncmin/implicit/thermochemreaction.hh
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/reaction.hh
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh
diff --git a/test/references/test_1pncmin-00064_batch.vtu b/test/references/test_1pncminni_box-reference.vtu
similarity index 100%
rename from test/references/test_1pncmin-00064_batch.vtu
rename to test/references/test_1pncminni_box-reference.vtu