diff --git a/dumux/material/fluidsystems/CMakeLists.txt b/dumux/material/fluidsystems/CMakeLists.txt
index 258e51b4e68b6b27ae04bfd0bc309b32d5396e80..ec102c893cecfe3dbc39ca62abbec50d556b980e 100644
--- a/dumux/material/fluidsystems/CMakeLists.txt
+++ b/dumux/material/fluidsystems/CMakeLists.txt
@@ -16,7 +16,6 @@ install(FILES
   liquidphase2c.hh
   nullparametercache.hh
   parametercachebase.hh
-  purewatersimple.hh
   spe5.hh
   spe5parametercache.hh
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidsystems)
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index 4801dd149d356c068dab5b92c99ec9dfa4a9bed2..96f214112c6844ce93460bc2aea928b17bbfb35e 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -43,7 +43,6 @@
 #include <dumux/material/fluidsystems/h2on2kinetic.hh>
 #include <dumux/material/fluidsystems/h2on2o2.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/material/fluidsystems/purewatersimple.hh>
 #include <dumux/material/fluidsystems/spe5.hh>
 
 // include all fluid states
diff --git a/test/material/fluidsystems/test_fluidsystems.cc b/test/material/fluidsystems/test_fluidsystems.cc
index f4944e895b5cef29a6b26e4a9394b4f8daf92cff..26a1ac90ef35c0dcbbeefd4e68eed253f76a5e26 100644
--- a/test/material/fluidsystems/test_fluidsystems.cc
+++ b/test/material/fluidsystems/test_fluidsystems.cc
@@ -39,7 +39,6 @@
 #include <dumux/material/fluidsystems/h2on2kinetic.hh>
 #include <dumux/material/fluidsystems/h2on2o2.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/material/fluidsystems/purewatersimple.hh>
 #include <dumux/material/fluidsystems/spe5.hh>
 
 // include all fluid states
@@ -203,12 +202,6 @@ int main()
     {   using FluidSystem = FluidSystems::LiquidPhase<Scalar, H2O>;
         success += checkFluidSystem<Scalar, FluidSystem>(); }
 
-    // pure water simple
-    {   using FluidSystem = FluidSystems::PureWaterSimpleFluidSystem<Scalar, /*enableComplexRelations=*/false>;
-        success += checkFluidSystem<Scalar, FluidSystem>(); }
-    {   using FluidSystem = FluidSystems::PureWaterSimpleFluidSystem<Scalar, /*enableComplexRelations=*/true>;
-        success += checkFluidSystem<Scalar, FluidSystem>(); }
-
     // spe5
     {   using FluidSystem = FluidSystems::Spe5<Scalar>;
         success += checkFluidSystem<Scalar, FluidSystem>(); }
diff --git a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
index 0c400f8bdf9354975585bd38b268900f2958b4b7..020599efebee9e408a4328c48281f58709ec2ff9 100644
--- a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
@@ -44,6 +44,7 @@ dune_add_test(COMPILE_ONLY # since it currently fails miserably with very differ
 #install sources
 install(FILES
 combustionproblem1c.hh
+combustionfluidsystem.hh
 combustionspatialparams.hh
 evaporationatmosphereproblem.hh
 evaporationatmospherespatialparams.hh
diff --git a/dumux/material/fluidsystems/purewatersimple.hh b/test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
similarity index 100%
rename from dumux/material/fluidsystems/purewatersimple.hh
rename to test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
index ba88ad0b9fb0e8edbe8d6376f20084400412633e..0e6e4c7dd42f7102a25b89ca718efb068b53d112 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
@@ -32,11 +32,12 @@
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/mpnc/model.hh>
 
-#include <dumux/material/fluidsystems/purewatersimple.hh>
+
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh>
 #include <dumux/material/constraintsolvers/computefromreferencephase.hh>
 
 #include "combustionspatialparams.hh"
+#include "combustionfluidsystem.hh"
 
 namespace Dumux
 {