diff --git a/flowexperimental/flowexp.hpp b/flowexperimental/flowexp.hpp
index ac5479ddf..81c6fd84e 100644
--- a/flowexperimental/flowexp.hpp
+++ b/flowexperimental/flowexp.hpp
@@ -126,12 +126,6 @@ template<class TypeTag>
 struct EnableTerminalOutput<TypeTag, Properties::TTag::FlowExpTypeTag>
 { static constexpr bool value = false; };
 
-// set the maximum number of Newton iterations to 8 so that we fail quickly (albeit
-// relatively often)
-template<class TypeTag>
-struct NewtonMaxIterations<TypeTag, Properties::TTag::FlowExpTypeTag>
-{ static constexpr int value = 8; };
-
 // the maximum volumetric error of a cell in the relaxed region
 template<class TypeTag>
 struct EclNewtonRelaxedTolerance<TypeTag, Properties::TTag::FlowExpTypeTag>
@@ -220,6 +214,7 @@ public:
         // smallest time step size is reached.
         Parameters::SetDefault<Parameters::ContinueOnConvergenceError>(true);
 
+        Parameters::SetDefault<Parameters::NewtonMaxIterations>(8);
         Parameters::SetDefault<Parameters::NewtonTolerance<Scalar>>(1e-2);
     }
 
diff --git a/opm/simulators/flow/NonlinearSolver.hpp b/opm/simulators/flow/NonlinearSolver.hpp
index 47056f6f1..ae242137c 100644
--- a/opm/simulators/flow/NonlinearSolver.hpp
+++ b/opm/simulators/flow/NonlinearSolver.hpp
@@ -76,14 +76,6 @@ struct NewtonRelaxationType<TypeTag, Properties::TTag::FlowNonLinearSolver>
 
 } // namespace Opm::Parameters
 
-namespace Opm::Parameters {
-
-template<class TypeTag>
-struct NewtonMaxIterations<TypeTag, Properties::TTag::FlowNonLinearSolver>
-{ static constexpr int value = 20; };
-
-} // namespace Opm::Parameters
-
 namespace Opm {
 
 // Available relaxation scheme types.
@@ -134,7 +126,7 @@ void stabilizeNonlinearUpdate(BVector& dx, BVector& dxOld,
 
                 // overload with given parameters
                 relaxMax_ = Parameters::get<TypeTag, Parameters::NewtonMaxRelax>();
-                maxIter_ = Parameters::get<TypeTag, Parameters::NewtonMaxIterations>();
+                maxIter_ = Parameters::Get<Parameters::NewtonMaxIterations>();
                 minIter_ = Parameters::get<TypeTag, Parameters::NewtonMinIterations>();
 
                 const auto& relaxationTypeString = Parameters::get<TypeTag, Parameters::NewtonRelaxationType>();
@@ -152,12 +144,14 @@ void stabilizeNonlinearUpdate(BVector& dx, BVector& dxOld,
             {
                 Parameters::registerParam<TypeTag, Parameters::NewtonMaxRelax>
                     ("The maximum relaxation factor of a Newton iteration");
-                Parameters::registerParam<TypeTag, Parameters::NewtonMaxIterations>
+                Parameters::Register<Parameters::NewtonMaxIterations>
                     ("The maximum number of Newton iterations per time step");
                 Parameters::registerParam<TypeTag, Parameters::NewtonMinIterations>
                     ("The minimum number of Newton iterations per time step");
                 Parameters::registerParam<TypeTag, Parameters::NewtonRelaxationType>
                     ("The type of relaxation used by Newton method");
+
+                Parameters::SetDefault<Parameters::NewtonMaxIterations>(20);
             }
 
             void reset()
diff --git a/tests/TestTypeTag.hpp b/tests/TestTypeTag.hpp
index a0938b96b..5d8b1040b 100644
--- a/tests/TestTypeTag.hpp
+++ b/tests/TestTypeTag.hpp
@@ -106,12 +106,6 @@ template<class TypeTag>
 struct MatrixAddWellContributions<TypeTag, Properties::TTag::TestTypeTag>
 { static constexpr bool value = true; };
 
-// set the maximum number of Newton iterations to 8 so that we fail quickly (albeit
-// relatively often)
-template<class TypeTag>
-struct NewtonMaxIterations<TypeTag, Properties::TTag::TestTypeTag>
-{ static constexpr int value = 8; };
-
 // currently, ebos uses the non-multisegment well model by default to avoid
 // regressions. the --use-multisegment-well=true|false command line parameter is still
 // available in ebos, but hidden from view.