diff --git a/test/porousmediumflow/2p/implicit/lensproblem.hh b/test/porousmediumflow/2p/implicit/lensproblem.hh
index 370ee055750a5004e09412777b03ac19f7d298d8..02e5edd6683dca0b98756edb2e432a66c8f50958 100644
--- a/test/porousmediumflow/2p/implicit/lensproblem.hh
+++ b/test/porousmediumflow/2p/implicit/lensproblem.hh
@@ -28,11 +28,15 @@
 
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/components/dnapl.hh>
+
+#include <dumux/discretization/cellcentered/box/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+
 #include <dumux/porousmediumflow/problem.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
 #include <dumux/porousmediumflow/2p/implicit/model.hh>
 #include <dumux/porousmediumflow/2p/implicit/gridadaptindicator.hh>
 #include <dumux/porousmediumflow/2p/implicit/adaptionhelper.hh>
+
 #include <dumux/implicit/adaptive/gridadaptinitializationindicator.hh>
 
 #include "lensspatialparams.hh"
@@ -90,12 +94,7 @@ public:
     typedef FluidSystems::LiquidPhase<Scalar, DNAPL<Scalar> > type;
 };
 
-// Linear solver settings
-SET_TYPE_PROP(LensCCProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-SET_TYPE_PROP(LensBoxProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
 #if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(LensCCAdaptiveProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-
 SET_BOOL_PROP(LensCCAdaptiveProblem, AdaptiveGrid, true);
 SET_TYPE_PROP(LensCCAdaptiveProblem, AdaptionIndicator, TwoPImplicitGridAdaptIndicator<TypeTag>);
 SET_TYPE_PROP(LensCCAdaptiveProblem,  AdaptionInitializationIndicator, ImplicitGridAdaptInitializationIndicator<TypeTag>);
@@ -103,8 +102,6 @@ SET_TYPE_PROP(LensCCAdaptiveProblem, AdaptionHelper, TwoPAdaptionHelper<TypeTag>
 #endif
 
 #if HAVE_UG
-SET_TYPE_PROP(LensBoxAdaptiveProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-
 SET_BOOL_PROP(LensBoxAdaptiveProblem, AdaptiveGrid, true);
 SET_TYPE_PROP(LensBoxAdaptiveProblem, AdaptionIndicator, TwoPImplicitGridAdaptIndicator<TypeTag>);
 SET_TYPE_PROP(LensBoxAdaptiveProblem,  AdaptionInitializationIndicator, ImplicitGridAdaptInitializationIndicator<TypeTag>);
diff --git a/test/porousmediumflow/2p/implicit/test_box2p.cc b/test/porousmediumflow/2p/implicit/test_box2p.cc
index 4b09751a67fddcba82f6e2f59bede3d056c91e7d..8b460ddb59c26c7826e72f0203137e5742bac9c1 100644
--- a/test/porousmediumflow/2p/implicit/test_box2p.cc
+++ b/test/porousmediumflow/2p/implicit/test_box2p.cc
@@ -247,4 +247,4 @@ catch (...)
 {
     std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
     return 4;
-}
\ No newline at end of file
+}
diff --git a/test/porousmediumflow/2p/implicit/test_cc2p.cc b/test/porousmediumflow/2p/implicit/test_cc2p.cc
index 35e01822dece1b6187bd9376a49181ed3a446bfd..833829b9d9cf4c622ab76e5453111915bff71fc3 100644
--- a/test/porousmediumflow/2p/implicit/test_cc2p.cc
+++ b/test/porousmediumflow/2p/implicit/test_cc2p.cc
@@ -246,4 +246,4 @@ catch (...)
 {
     std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
     return 4;
-}
\ No newline at end of file
+}