diff --git a/dumux/freeflow/zeroeq/model.hh b/dumux/freeflow/zeroeq/model.hh
index 10948aaba3619e70e5dcdc35f1490451f5ebae96..25532d2fd519dc2a5225b9eec3398a11e0be23b3 100644
--- a/dumux/freeflow/zeroeq/model.hh
+++ b/dumux/freeflow/zeroeq/model.hh
@@ -467,7 +467,7 @@ public:
      *
      * \param globalPos Global Position.
      */
-    const int getPosIdx(const GlobalPosition &globalPos) const
+    int getPosIdx(const GlobalPosition &globalPos) const
     {
         int posIdx = int (intervals * (globalPos[flowNormal_] - this->problem_().bBoxMin()[flowNormal_]))
                          / (this->problem_().bBoxMax()[flowNormal_] - this->problem_().bBoxMin()[flowNormal_]);
@@ -482,7 +482,7 @@ public:
      * \param posIdx Position Index of current Global Position.
      * \param globalPos Global Position.
      */
-    const int getWallIdx(const GlobalPosition &globalPos, const int posIdx) const
+    int getWallIdx(const GlobalPosition &globalPos, const int posIdx) const
     {
         if (walls == 0)
             DUNE_THROW(Dune::NotImplemented, "Eddy viscosity models are not implemented for use without walls.");
@@ -574,7 +574,7 @@ public:
      * \param globalPos Global Position.
      * \param posIdx Position Index of current Global Position.
      */
-    const bool useViscosityInner(const GlobalPosition &globalPos, const int posIdx) const
+    bool useViscosityInner(const GlobalPosition &globalPos, const int posIdx) const
     {
         for (int wallIdx = 0; wallIdx < walls; ++wallIdx)
             if ((wall[wallIdx].isBBoxMinWall && globalPos[wallNormal_] < wall[wallIdx].wallPos[posIdx] + wall[wallIdx].crossLength[posIdx])
@@ -813,7 +813,7 @@ public:
      *
      * \param wallIdx Wall Index of current Global Position.
      */
-    const void interpolateWallProperties(const int wallIdx)
+    void interpolateWallProperties(const int wallIdx)
     {
         const int startInterpolation = 0;
         const int endInterpolation = intervals;
@@ -894,7 +894,7 @@ public:
      * \param prevIdx Position Index with value.
      * \param nextIdx Position Index with value.
      */
-    const void doInterpolationFluxValues(const int wallIdx, const int posIdx, const int prevIdx, const int nextIdx)
+    void doInterpolationFluxValues(const int wallIdx, const int posIdx, const int prevIdx, const int nextIdx)
     {
         wall[wallIdx].boundaryLayerThickness[posIdx] = interpolation(posIdx, prevIdx, wall[wallIdx].boundaryLayerThickness[prevIdx], nextIdx, wall[wallIdx].boundaryLayerThickness[nextIdx]);
         wall[wallIdx].boundaryLayerThicknessCalculated[posIdx] = interpolation(posIdx, prevIdx, wall[wallIdx].boundaryLayerThicknessCalculated[prevIdx], nextIdx, wall[wallIdx].boundaryLayerThicknessCalculated[nextIdx]);
@@ -920,7 +920,7 @@ public:
      * \param prevIdx Position Index with value.
      * \param nextIdx Position Index with value.
      */
-    const void doInterpolationWallValues(const int wallIdx, const int posIdx, const int prevIdx, const int nextIdx)
+    void doInterpolationWallValues(const int wallIdx, const int posIdx, const int prevIdx, const int nextIdx)
     {
         wall[wallIdx].wallDensity[posIdx] = interpolation(posIdx, prevIdx, wall[wallIdx].wallDensity[prevIdx], nextIdx, wall[wallIdx].wallDensity[nextIdx]);
         wall[wallIdx].wallKinematicViscosity[posIdx] = interpolation(posIdx, prevIdx, wall[wallIdx].wallKinematicViscosity[prevIdx], nextIdx, wall[wallIdx].wallKinematicViscosity[nextIdx]);
@@ -952,7 +952,7 @@ public:
      *
      * Surface roughness is not included in the Baldwin Lomax model
      */
-    const bool surfaceRoughnessNotImplemented() const
+    bool surfaceRoughnessNotImplemented() const
     {
         switch (GET_PARAM_FROM_GROUP(TypeTag, int, ZeroEq, EddyViscosityModel))
         {
diff --git a/dumux/implicit/adaptive/gridadapt.hh b/dumux/implicit/adaptive/gridadapt.hh
index 351adbf29e589e34b591101203bdedc0f8c69d6c..80b950f45ed98fca3a7564886eb15a298776fef1 100644
--- a/dumux/implicit/adaptive/gridadapt.hh
+++ b/dumux/implicit/adaptive/gridadapt.hh
@@ -268,7 +268,7 @@ public:
         return (sumMarked != 0 || sumCoarsened != 0);
     }
 
-    const bool wasAdapted() const
+    bool wasAdapted() const
     {
         int sumMarked = problem_.grid().comm().sum(marked_);
         int sumCoarsened = problem_.grid().comm().sum(coarsened_);
@@ -297,7 +297,7 @@ public:
      * not the actual maximum level of the grid.
      * @return levelMax_ maximum level for refinement
      */
-    const int getMaxLevel() const
+    int getMaxLevel() const
     {
         return levelMax_;
     }
@@ -308,7 +308,7 @@ public:
      * not the actual minimum level of the grid.
      * @return levelMin_ minimum level for coarsening
      */
-    const int getMinLevel() const
+    int getMinLevel() const
     {
         return levelMin_;
     }
@@ -456,7 +456,7 @@ public:
     {}
     void setTolerance(int, int)
     {}
-    const void setIndicator(const SolutionVector&,
+    void setIndicator(const SolutionVector&,
                             const Scalar&, const Scalar&)
     {}
     ImplicitGridAdapt (Problem& problem)
diff --git a/dumux/io/gridcreator.hh b/dumux/io/gridcreator.hh
index d27b9bf0fa1bac1ae1b1b18009c087d10b854b99..a972c38d58215a8af7a9fc216952a7f9e66da68e 100644
--- a/dumux/io/gridcreator.hh
+++ b/dumux/io/gridcreator.hh
@@ -131,7 +131,7 @@ public:
               Only available when using Gmsh with GridParameterGroup.DomainMarkers = 1.
      * \param boundarySegmentIndex The boundary segment index of the intersection (intersection.boundarySegmentIndex()
      */
-    static const int getBoundaryDomainMarker(int boundarySegmentIndex)
+    static int getBoundaryDomainMarker(int boundarySegmentIndex)
     {
         if(enableGmshDomainMarkers_)
             return boundaryMarkers_[boundarySegmentIndex];
@@ -147,7 +147,7 @@ public:
               Only available when using Gmsh with GridParameterGroup.DomainMarkers = 1.
      * \param elementIdx The element index
      */
-    static const int getElementDomainMarker(int elementIdx)
+    static int getElementDomainMarker(int elementIdx)
     {
         if(enableGmshDomainMarkers_)
         {
diff --git a/dumux/porousmediumflow/2p1c/implicit/localresidual.hh b/dumux/porousmediumflow/2p1c/implicit/localresidual.hh
index bb1fb8cb1c48a57f835f0a6cbcbde4ab6e6f9654..51a772df81669f7b9b2821a65cf12b2256e535fe 100644
--- a/dumux/porousmediumflow/2p1c/implicit/localresidual.hh
+++ b/dumux/porousmediumflow/2p1c/implicit/localresidual.hh
@@ -190,7 +190,7 @@ public:
      * \brief Returns true if a spurious flow has been detected
      *
      */
-    const bool spuriousFlowDetected() const
+    bool spuriousFlowDetected() const
     {
         return spuriousFlowDetected_;
     }
diff --git a/dumux/porousmediumflow/2p2c/implicit/volumevariables.hh b/dumux/porousmediumflow/2p2c/implicit/volumevariables.hh
index d57af6f742dd0a0ba56fe8ea36ff5c67a404fd26..ed3f2df9e458c394e2dfa0b170706ff2896a064a 100644
--- a/dumux/porousmediumflow/2p2c/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/volumevariables.hh
@@ -459,7 +459,7 @@ public:
     /*!
      * \brief Returns the phase presence within the control volume.
      */
-    const int phasePresence() const
+    int phasePresence() const
     { return phasePresence_; }
 
     /*!
diff --git a/dumux/porousmediumflow/2p2c/sequential/celldata.hh b/dumux/porousmediumflow/2p2c/sequential/celldata.hh
index 4d16cdfcac14711d2d1de99d02ef2645d9b63daa..1676e4f333606de640cdba5935b63c9ceedd977b 100644
--- a/dumux/porousmediumflow/2p2c/sequential/celldata.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/celldata.hh
@@ -361,7 +361,7 @@ public:
     int& globalIdx()
     { return globalIdx_;}
     //! Indicates if volume derivatives are computed and available
-    const bool hasVolumeDerivatives() const
+    bool hasVolumeDerivatives() const
     { return volumeDerivativesAvailable_;}
     //! Specifies that volume derivatives are computed and available
     void confirmVolumeDerivatives()
diff --git a/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh b/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh
index ae112de9bbcd1c6a6ac5585173a804e952a43bb7..294564494ea62d86371efe2927eae2f42ac4f84c 100644
--- a/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh
@@ -311,7 +311,7 @@ public:
     }
 
     //! Returns the type of the fluidState
-    const bool fluidStateType() const
+    bool fluidStateType() const
     { return fluidStateType_;}
 
 };
diff --git a/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh b/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh
index 10f4c5a0e612069d17ab853a93b2bcefe29ed8ab..bee4f79773a523e54d460ab055c6d5f1de41f034 100644
--- a/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh
@@ -144,7 +144,7 @@ public:
      *
      * \param phaseIdx index of the phase
      */
-    const unsigned int downstreamIdx(const unsigned phaseIdx) const
+    unsigned int downstreamIdx(const unsigned phaseIdx) const
     { return downstreamIdx_[phaseIdx]; }
 
     /*!
@@ -153,7 +153,7 @@ public:
      *
      * \param phaseIdx index of the phase
      */
-    const unsigned int upstreamIdx(const unsigned phaseIdx) const
+    unsigned int upstreamIdx(const unsigned phaseIdx) const
     { return upstreamIdx_[phaseIdx]; }
 
     /*!
diff --git a/dumux/porousmediumflow/2pminc/implicit/indices.hh b/dumux/porousmediumflow/2pminc/implicit/indices.hh
index 83cf0dc100475d35c2ef06c8e1667af2aaae31c8..402f2bffaceee1671c011d4d87a14a0ea8eb3187 100644
--- a/dumux/porousmediumflow/2pminc/implicit/indices.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/indices.hh
@@ -87,11 +87,11 @@ struct TwoPMincIndices
     static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
     static const int contiNEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase
 
-    static const int pIdxc(int numC) {return pwIdx + 2 *numC;} //!< index of the wetting phase pressure for continuum numC
-    static const int sIdxc(int numC) {return snIdx + 2 *numC;} //!< index of the non-wetting phase saturation for continuum numC
+    static int pIdxc(int numC) {return pwIdx + 2 *numC;} //!< index of the wetting phase pressure for continuum numC
+    static int sIdxc(int numC) {return snIdx + 2 *numC;} //!< index of the non-wetting phase saturation for continuum numC
 
-    static const int contiWEqIdxc(int numC) {return contiWEqIdx + 2 *numC;} //!< Index of the continuity equation of the wetting phase for continuum numC
-    static const int contiNEqIdxc(int numC) {return contiNEqIdx + 2 *numC;} //!< Index of the continuity equation of the non-wetting phase for continuum numC
+    static int contiWEqIdxc(int numC) {return contiWEqIdx + 2 *numC;} //!< Index of the continuity equation of the wetting phase for continuum numC
+    static int contiNEqIdxc(int numC) {return contiNEqIdx + 2 *numC;} //!< Index of the continuity equation of the non-wetting phase for continuum numC
 };
 
 /*!
@@ -118,11 +118,11 @@ struct TwoPMincIndices<TypeTag, TwoPMincFormulation::pnsw, PVOffset>
     static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase
     static const int contiWEqIdx = PVOffset + 1; //!< Index of the continuity equation of the wetting phase
 
-    static const int pIdxc(int numC) {return pnIdx + 2 *numC;} //!< index of the nonwetting phase pressure for continuum numC
-    static const int sIdxc(int numC) {return swIdx + 2 *numC;} //!< index of the wetting phase saturation for continuum numC
+    static int pIdxc(int numC) {return pnIdx + 2 *numC;} //!< index of the nonwetting phase pressure for continuum numC
+    static int sIdxc(int numC) {return swIdx + 2 *numC;} //!< index of the wetting phase saturation for continuum numC
 
-    static const int contiWEqIdxc(int numC) {return contiWEqIdx + 2 *numC;} //!< Index of the continuity equation of the wetting phase for continuum numC
-    static const int contiNEqIdxc(int numC) {return contiNEqIdx + 2 *numC;} //!< Index of the continuity equation of the non-wetting phase for continuum numC
+    static int contiWEqIdxc(int numC) {return contiWEqIdx + 2 *numC;} //!< Index of the continuity equation of the wetting phase for continuum numC
+    static int contiNEqIdxc(int numC) {return contiNEqIdx + 2 *numC;} //!< Index of the continuity equation of the non-wetting phase for continuum numC
 };
 
 // \}
diff --git a/dumux/porousmediumflow/implicit/cpdarcyfluxvariables.hh b/dumux/porousmediumflow/implicit/cpdarcyfluxvariables.hh
index e8526f1208e249e91e76b4610057d5e65198719b..69cc5aeb696b228a8ba6f7735b1cfe50d3181d9b 100644
--- a/dumux/porousmediumflow/implicit/cpdarcyfluxvariables.hh
+++ b/dumux/porousmediumflow/implicit/cpdarcyfluxvariables.hh
@@ -133,7 +133,7 @@ public:
      *
      * \param phaseIdx index of the phase
      */
-    const unsigned int downstreamIdx(const unsigned phaseIdx) const
+    unsigned int downstreamIdx(const unsigned phaseIdx) const
     { return downstreamIdx_[phaseIdx]; }
 
     /*!
@@ -142,7 +142,7 @@ public:
      *
      * \param phaseIdx index of the phase
      */
-    const unsigned int upstreamIdx(const unsigned phaseIdx) const
+    unsigned int upstreamIdx(const unsigned phaseIdx) const
     { return upstreamIdx_[phaseIdx]; }
 
     /*!
diff --git a/dumux/porousmediumflow/implicit/darcyfluxvariables.hh b/dumux/porousmediumflow/implicit/darcyfluxvariables.hh
index 77a083d1a7e9d2d4a7555a70d8c076810fcc2fbe..812f5c49ab017f22cc4878395e0cc23cf098ff7b 100644
--- a/dumux/porousmediumflow/implicit/darcyfluxvariables.hh
+++ b/dumux/porousmediumflow/implicit/darcyfluxvariables.hh
@@ -143,7 +143,7 @@ public:
      *
      * \param phaseIdx index of the phase
      */
-    const unsigned int downstreamIdx(const unsigned phaseIdx) const
+    unsigned int downstreamIdx(const unsigned phaseIdx) const
     { return downstreamIdx_[phaseIdx]; }
 
     /*!
@@ -152,7 +152,7 @@ public:
      *
      * \param phaseIdx index of the phase
      */
-    const unsigned int upstreamIdx(const unsigned phaseIdx) const
+    unsigned int upstreamIdx(const unsigned phaseIdx) const
     { return upstreamIdx_[phaseIdx]; }
 
     /*!
@@ -325,7 +325,7 @@ protected:
     }
 
     // set const reference to the fvGeometry
-    const void setFVGeometryPtr_(const FVElementGeometry& fvGeometry)
+    void setFVGeometryPtr_(const FVElementGeometry& fvGeometry)
     { fvGeometryPtr_ = &fvGeometry; }
 
     // return const reference to the fvGeometry
diff --git a/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh b/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh
index 98d4289260de43ebf77f3c3faeb96295c79915eb..6ee50adac9abe279c5958fc977b5a43959ce9da3 100644
--- a/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh
+++ b/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh
@@ -390,7 +390,7 @@ protected:
       * \return True if all off-diagonals are zero.
       *
      */
-     const bool isDiagonal_(const DimWorldMatrix & K) const
+     bool isDiagonal_(const DimWorldMatrix & K) const
      {
          for (int i = 0; i < dim; i++) {
              for (int k = 0; k < dim; k++) {
diff --git a/dumux/porousmediumflow/sequential/gridadapt.hh b/dumux/porousmediumflow/sequential/gridadapt.hh
index b6733fffdb76d64850061c73685166192ffca759..f22c012334c7461f50e4e322bf625c63c37a6691 100644
--- a/dumux/porousmediumflow/sequential/gridadapt.hh
+++ b/dumux/porousmediumflow/sequential/gridadapt.hh
@@ -317,7 +317,7 @@ public:
      * not the actual maximum level of the grid.
      * @return levelMax_ maximum level for refinement
      */
-    const int getMaxLevel() const
+    int getMaxLevel() const
     {
         return levelMax_;
     }
@@ -328,7 +328,7 @@ public:
      * not the actual minimum level of the grid.
      * @return levelMin_ minimum level for coarsening
      */
-    const int getMinLevel() const
+    int getMinLevel() const
     {
         return levelMin_;
     }
@@ -474,7 +474,7 @@ public:
     {}
     void setTolerance(int, int)
     {}
-    const void setIndicator(const ScalarSolutionType&,
+    void setIndicator(const ScalarSolutionType&,
                             const Scalar&, const Scalar&)
     {}
     GridAdapt (Problem& problem)
diff --git a/dumux/porousmediumflow/sequential/impetproblem.hh b/dumux/porousmediumflow/sequential/impetproblem.hh
index 571de05e9e0a57b56d57024c445465722c1a15cc..bfc96b6d40222ec0629c8a23f47b05e62d3ecb2a 100644
--- a/dumux/porousmediumflow/sequential/impetproblem.hh
+++ b/dumux/porousmediumflow/sequential/impetproblem.hh
@@ -789,7 +789,7 @@ public:
      *
      * Level is set by property or input file.
      */
-    const int vtkOutputLevel() const
+    int vtkOutputLevel() const
     {
         return vtkOutputLevel_;
     }
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index 614fea99c26a71c2f9e91a836d1d54d42dae0a6f..3db006a52026100e45a8c382a46d4c2cdedd094c 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/test/geomechanics/el2p/el2pproblem.hh
@@ -294,7 +294,7 @@ public:
 
     // returns the coupled_ variable which defines if geomechanical feedback on flow is taken
     // into account
-    const bool coupled() const
+    bool coupled() const
     {
         return coupled_;
     }
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
index 7d2ac6e5936851c82531dbaa6f391aa2e1b75f38..e3293ca7de29e12463cb02ffa2583f8df1ba4e75 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
@@ -184,7 +184,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
 /*!
  * \copydoc TestDecTwoPTwoCProblem::boundaryFormulation()
  */
-const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
+void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
 {
     bcFormulation = Indices::concentration;
 }
@@ -235,7 +235,7 @@ void source(PrimaryVariables &values, const Element &element)
 /*!
  * \copydoc TestDecTwoPTwoCProblem::initialFormulation()
  */
-const void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
+void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
 {
     initialFormulation = Indices::concentration;
 }
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
index c121da8a5e2bba8ee13c98c1f77b7e501ea6fc0f..d29abda775ea441ddac5da0f293d0e8cf924f57e 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
@@ -196,7 +196,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
 /*!
  * \copydoc TestDecTwoPTwoCProblem::boundaryFormulation()
  */
-const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
+void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
 {
     bcFormulation = Indices::BoundaryFormulation::concentration;
 }
@@ -239,7 +239,7 @@ void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos
 /*!
  * \copydoc TestDecTwoPTwoCProblem::initialFormulation()
  */
-const void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
+void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
 {
     initialFormulation = Indices::BoundaryFormulation::concentration;
 }
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
index 96e2e706049e5b02d2a5c14d5edef3a56987e2a9..012d38f6b85f72742e26b8fcdc6439613ff1ef0c 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
@@ -183,7 +183,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
  * \param bcFormulation The boundary formulation for the conservation equations.
  * \param intersection The intersection on the boundary.
  */
-const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
+void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
 {
     bcFormulation = Indices::concentration;
 }
@@ -247,7 +247,7 @@ void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos
  * a component per total mass inside the control volume) or by means
  * of a saturation.
  */
-const void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
+void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
 {
     initialFormulation = Indices::concentration;
 }
diff --git a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
index 9e3799c56fd4033047b78bf57d82cd65df609a0a..a68e9097e6afa95daafc30ec1ee248132f8c0e95 100644
--- a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
@@ -179,7 +179,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
 /*!
  * \copydoc TestDecTwoPTwoCProblem::boundaryFormulation()
  */
-const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
+void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
 {
     bcFormulation = Indices::concentration;
 }
@@ -220,7 +220,7 @@ void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos
 /*!
  * \copydoc TestDecTwoPTwoCProblem::initialFormulation()
  */
-const void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
+void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
 {
     initialFormulation = Indices::concentration;
 }
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
index d3ca24a70badddb8036fefa7bc013ddd65152a4b..e76893389538885c5e18134bb76e52e25e706270 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
@@ -546,7 +546,7 @@ public:
      * That does not work.
      * -> be careful with neumannAtPos
      */
-    const bool inPM_(const GlobalPosition & globalPos) const
+    bool inPM_(const GlobalPosition & globalPos) const
     {       return ( (globalPos[dimWorld-1] > 0. - 1e-6) and (globalPos[dimWorld-1] < (heightPM_ + 1e-6 ) ) );   }
 
     /*!
@@ -560,7 +560,7 @@ public:
      * That does not work.
      * -> be careful with neumannAtPos
      */
-    const bool inFF_(const GlobalPosition & globalPos) const
+    bool inFF_(const GlobalPosition & globalPos) const
     {       return ( (globalPos[dimWorld-1] < heightDomain_ + 1e-6) and (globalPos[dimWorld-1] > (heightPM_ + 1e-6) ) );   }
 
     /*!
@@ -574,7 +574,7 @@ public:
      * That does not work.
      * -> be careful with neumannAtPos
      */
-    const bool inInjection_(const GlobalPosition & globalPos) const
+    bool inInjection_(const GlobalPosition & globalPos) const
     {       return ( (globalPos[dimWorld-1] < heightDomain_ - 0.25*heightDomain_  + 1e-6) and (globalPos[dimWorld-1] > (heightPM_ + 1e-6) ) );   }
 
     /*! \brief access function for the depth / height of the porous medium */
diff --git a/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh b/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh
index cd3ab7cd21f302f376607ee3aa8b033996e195c6..6606bf0163bd34cd85dd65fa9d59d7a05162a11c 100644
--- a/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh
+++ b/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh
@@ -209,7 +209,7 @@ public:
     /*!
      * \brief   Check whether the current point is on a line between two points
      */
-    const bool isBetween(const GlobalPosition & globalPosCurrent,
+    bool isBetween(const GlobalPosition & globalPosCurrent,
                          const GlobalPosition & pointOne,
                          const GlobalPosition & pointTwo) const
     {