diff --git a/test/porousmediumflow/2p1c/main.cc b/test/porousmediumflow/2p1c/main.cc
index a77e783cd25b665278a3a7d2b68e2d5a671041bd..04fc295fd9e3a165c716ad5b8c0c3bfb12f64486 100644
--- a/test/porousmediumflow/2p1c/main.cc
+++ b/test/porousmediumflow/2p1c/main.cc
@@ -24,17 +24,10 @@
 
 #include <config.h>
 
-#include "properties.hh"
-
-#include <ctime>
 #include <iostream>
 
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/timer.hh>
-#include <dune/grid/io/file/vtk.hh>
-#include <dune/istl/io.hh>
-
-#include <dumux/discretization/method.hh>
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
@@ -46,7 +39,9 @@
 #include <dumux/assembly/fvassembler.hh>
 
 #include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
+
+#include "properties.hh"
 
 int main(int argc, char** argv)
 {
diff --git a/test/porousmediumflow/2p1c/problem.hh b/test/porousmediumflow/2p1c/problem.hh
index ef1351b06d24ca5e6c1eb4583f5129f41779d978..d4a97bdbac595a5d272580de9d1380a46784ba31 100644
--- a/test/porousmediumflow/2p1c/problem.hh
+++ b/test/porousmediumflow/2p1c/problem.hh
@@ -27,11 +27,12 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
 #include <dumux/common/boundarytypes.hh>
+
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
+
 /*!
  * \ingroup TwoPOneCTests
  * \brief Non-isothermal 2D problem where steam is injected on the lower left side of the domain.
diff --git a/test/porousmediumflow/2p1c/properties.hh b/test/porousmediumflow/2p1c/properties.hh
index 0be7582be651e9116770bda509b0a5c1aa2e9ef5..171711da59d6a438b97e3cc5fe474919787ca02c 100644
--- a/test/porousmediumflow/2p1c/properties.hh
+++ b/test/porousmediumflow/2p1c/properties.hh
@@ -38,7 +38,9 @@
 
 #include "problem.hh"
 #include "spatialparams.hh"
+
 namespace Dumux::Properties {
+
 // Create new type tags
 namespace TTag {
 struct InjectionProblem { using InheritsFrom = std::tuple<TwoPOneCNI>; };
@@ -77,6 +79,7 @@ struct SpatialParams<TypeTag, TTag::InjectionProblem>
 //Define whether spurious cold-water flow into the steam is blocked
 template<class TypeTag>
 struct UseBlockingOfSpuriousFlow<TypeTag, TTag::InjectionProblem> { static constexpr bool value = true; };
+
 } // end namespace Dumux::Properties
 
 #endif