diff --git a/dumux/boxmodels/common/boxproperties.hh b/dumux/boxmodels/common/boxproperties.hh
index 8711ff725d84b8e7245dde81922056b05475110e..babc27692c75690d4901269837aa770aae34058b 100644
--- a/dumux/boxmodels/common/boxproperties.hh
+++ b/dumux/boxmodels/common/boxproperties.hh
@@ -46,7 +46,7 @@ namespace Properties
 //////////////////////////////////////////////////////////////////
 
 //! The type tag for models based on the box-scheme
-NEW_TYPE_TAG(BoxModel, INHERITS_FROM(ImplicitModel, LinearSolver));
+NEW_TYPE_TAG(BoxModel, INHERITS_FROM(ImplicitModel, LinearSolverTypeTag));
 
 //////////////////////////////////////////////////////////////////
 // Property tags
@@ -81,7 +81,6 @@ NEW_PROP_TAG(BoundaryVariables); //!< Data required to calculate fluxes over bou
 NEW_PROP_TAG(TimeManager);  //!< Manages the simulation time
 NEW_PROP_TAG(NewtonMethod);     //!< The type of the newton method
 NEW_PROP_TAG(NewtonController); //!< The type of the newton controller
-NEW_PROP_TAG(LinearSolver); //!< The type of the linear solver to be used
 
 //! Specify whether the jacobian matrix of the last iteration of a
 //! time step should be re-used as the jacobian of the first iteration
diff --git a/dumux/decoupled/common/decoupledproperties.hh b/dumux/decoupled/common/decoupledproperties.hh
index 688ead59c7d0cc3515bc5443fb1e3e2fb272edc5..541ec12ae0f514c1fd29b793ef79022322ad1101 100644
--- a/dumux/decoupled/common/decoupledproperties.hh
+++ b/dumux/decoupled/common/decoupledproperties.hh
@@ -45,7 +45,7 @@ namespace Properties
 //////////////////////////////////////////////////////////////////
 
 //! Create a type tag for all decoupled models
-NEW_TYPE_TAG(DecoupledModel, INHERITS_FROM(ExplicitModel, LinearSolver));
+NEW_TYPE_TAG(DecoupledModel, INHERITS_FROM(ExplicitModel, LinearSolverTypeTag));
 
 //////////////////////////////////////////////////////////////////
 // Property tags
diff --git a/dumux/linear/linearsolverproperties.hh b/dumux/linear/linearsolverproperties.hh
index 9a25b658de0295397f25ef10dd6a04a7c19ea4b3..2606805aba7aef3fa33780e8fa1e4f0cc3b92aad 100644
--- a/dumux/linear/linearsolverproperties.hh
+++ b/dumux/linear/linearsolverproperties.hh
@@ -33,7 +33,10 @@ namespace Dumux
 namespace Properties
 {
 //! Linear solver type tag for all models.
-NEW_TYPE_TAG(LinearSolver);
+NEW_TYPE_TAG(LinearSolverTypeTag);
+
+//! The type of the linear solver to be used
+NEW_PROP_TAG(LinearSolver);
 
 /*!
  * \brief Specifies the verbosity of the linear solver