diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh
index 524b754cd12b572aacb5e441f5c3d916c0ced1f6..d0aa656f6fd23a6cca83d11add998d6d3c3dce8b 100644
--- a/dumux/material/components/mesitylene.hh
+++ b/dumux/material/components/mesitylene.hh
@@ -40,7 +40,7 @@ namespace Dumux
 template <class Scalar>
 class Mesitylene : public Component<Scalar, Mesitylene<Scalar> >
 {
-    using Consts = Constants<Scalar>;;
+    using Consts = Constants<Scalar>;
 
 public:
     /*!
diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh
index ce5a7a9af44deb60fd4bed64da317ecd666c4dae..d234602148382172ac7c17cde80d7246b9ff4978 100644
--- a/dumux/material/components/xylene.hh
+++ b/dumux/material/components/xylene.hh
@@ -41,7 +41,7 @@ namespace Dumux
 template <class Scalar>
 class Xylene : public Component<Scalar, Xylene<Scalar> >
 {
-    using Consts = Constants<Scalar>;;
+    using Consts = Constants<Scalar>;
 
 public:
     /*!
diff --git a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
index db51258e8a204e0d36511f392c3701b9c20e1e2c..42b02d3abf547a84fcc60c21b6d4f3c5cc21b4c3 100644
--- a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
@@ -178,7 +178,7 @@ public:
         switch (phaseIdx) {
         case wPhaseIdx: return "w";
         case nPhaseIdx: return "n";
-        case gPhaseIdx: return "g";;
+        case gPhaseIdx: return "g";
         };
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
index 620fc9748367bae252af7d34b13de18c3ad31a13..4632a94ca82970bcf3f98e00c6106668fcfbc3c1 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
@@ -135,7 +135,7 @@ public:
         viscosity_[wPhaseIdx] = 0.;
         viscosity_[nPhaseIdx] = 0.;
 
-        vtkOutputLevel_ = getParam<int>("Vtk.OutputLevel");;
+        vtkOutputLevel_ = getParam<int>("Vtk.OutputLevel");
     }
 
     // For initialization
diff --git a/dumux/porousmediumflow/3pwateroil/volumevariables.hh b/dumux/porousmediumflow/3pwateroil/volumevariables.hh
index 805e32f29c0a1bbf2e10e5350316e659b7e59666..410866474eed889caef05efd3c15db0760970e03 100644
--- a/dumux/porousmediumflow/3pwateroil/volumevariables.hh
+++ b/dumux/porousmediumflow/3pwateroil/volumevariables.hh
@@ -350,7 +350,7 @@ public:
                 // water and NAPL are present, phase compositions are a
                 // mole fractions of non-existing gas phase are used as switching criteria
                 Scalar partPressH2O = FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, wCompIdx);
-                Scalar partPressNAPL =  FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, nCompIdx);;
+                Scalar partPressNAPL =  FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, nCompIdx);
 
                 Scalar xgn = partPressNAPL/pg_;
                 Scalar xgw = partPressH2O/pg_;
@@ -601,7 +601,7 @@ public:
             else if (phasePresence == wnPhaseOnly) {
                 // mole fractions of non-existing gas phase are used as switching criteria
                 Scalar partPressH2O = FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, wCompIdx);
-                Scalar partPressNAPL =  FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, nCompIdx);;
+                Scalar partPressNAPL =  FluidSystem::partialPressureGas(fluidState_, gPhaseIdx, nCompIdx);
 
                 Scalar xgn = partPressNAPL/pg_;
                 Scalar xgw = partPressH2O/pg_;
diff --git a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
index 275cf8780c8775a63e6ca7a5aea4596f402bd3f0..867a66d4cf2d43bfb3e51a4932e51c2e59d30a1f 100644
--- a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
@@ -40,16 +40,16 @@ class NoPrimaryVariableSwitch
 {
 public:
     template<typename... Args>
-    void init(Args&&... args) {};
+    void init(Args&&... args) {}
 
     template<typename... Args>
-    bool wasSwitched(Args&&... args) const { return false; };
+    bool wasSwitched(Args&&... args) const { return false; }
 
     template<typename... Args>
-    bool update(Args&&... args) { return false; };
+    bool update(Args&&... args) { return false; }
 
     template<typename... Args>
-    bool update_(Args&&... args) {return false; };
+    bool update_(Args&&... args) {return false; }
 };
 
 /*!
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
index d516c2412c5c12df681963f103538d9f26307996..4967e6863fcc36943d289ecb1a55ad4320991371 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
+++ b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
@@ -91,7 +91,7 @@ class ThermoChemProblem : public PorousMediumFlowProblem<TypeTag>
     using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
     using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
     using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
-    using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);;
+    using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
     using Element = typename GridView::template Codim<0>::Entity;
     using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
index 91f9d57adaab3feedddecce8714301ed975b7a47..7fc5175b80626295663cdb5b3ffda736e0a3089a 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
@@ -328,8 +328,8 @@ public:
 
         if (onLeftBoundary_(globalPos))
         {
-            values[conti00EqIdx + wCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, wCompIdx);;
-            values[conti00EqIdx + nCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, nCompIdx);;
+            values[conti00EqIdx + wCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, wCompIdx);
+            values[conti00EqIdx + nCompIdx] = - molarFlux * fluidState.moleFraction(wPhaseIdx, nCompIdx);
             values[energyEq0Idx] = - massFluxInjectedPhase * fluidState.enthalpy(wPhaseIdx);
         }
         return values;
diff --git a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
index 47cc7d6f649bde84948992ed61b47054d82ba1a2..c29ba50dec82b9875dcfb8827565136141c168e8 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
@@ -100,7 +100,7 @@ public:
         // this is the parameter value from file part
         porosity_ = getParam<Scalar>("SpatialParams.PorousMedium.porosity");
         intrinsicPermeabilityOutFlow_ = getParam<Scalar>("SpatialParams.Outflow.permeabilityOutFlow");
-        porosityOutFlow_                = getParam<Scalar>("SpatialParams.Outflow.porosityOutFlow");;
+        porosityOutFlow_                = getParam<Scalar>("SpatialParams.Outflow.porosityOutFlow");
         solidThermalConductivityOutflow_ =getParam<Scalar>("SpatialParams.Outflow.soilThermalConductivityOutFlow");
         solidDensity_   = getParam<Scalar>("SpatialParams.soil.density");
         solidThermalConductivity_ = getParam<Scalar>("SpatialParams.soil.thermalConductivity");
@@ -304,7 +304,7 @@ public:
     }
 
 private:
-    static constexpr Scalar eps_ = 1e-6;;
+    static constexpr Scalar eps_ = 1e-6;
 
     // Porous Medium Domain
     Scalar intrinsicPermeability_ ;
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
index 6ace49f6a1192dd590ae8cb848741d38526208b9..1047128da4d3142deb6673f2ea139d2b2b4a3c99 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
@@ -537,7 +537,7 @@ public:
     { return heightPM_; }
 
 private:
-    static constexpr Scalar eps_  = 1e-6;;
+    static constexpr Scalar eps_  = 1e-6;
     Scalar heightDomain_ ;
 
     AwnSurfaceParams    aWettingNonWettingSurfaceParams_;