diff --git a/test/freeflow/navierstokes/navierstokestestproblem.hh b/test/freeflow/navierstokes/navierstokestestproblem.hh
index 800c10e442f98dd1819652b0e80877ebd8693374..a33fac495f956af91b414f1a2e458378be38349f 100644
--- a/test/freeflow/navierstokes/navierstokestestproblem.hh
+++ b/test/freeflow/navierstokes/navierstokestestproblem.hh
@@ -77,9 +77,6 @@ namespace Dumux
     };
     // Scalar is set to type double
     SET_TYPE_PROP(BoxStokes, Scalar, double);
-
-    // Disable gravity
-    SET_BOOL_PROP(NavierStokesTestProblem, ProblemEnableGravity, false);
   }
 
   /*!
diff --git a/test/freeflow/navierstokes/test_navierstokes.input b/test/freeflow/navierstokes/test_navierstokes.input
index 94942db0b1e01277badaebe3798043d3285c8d9c..0c849c59a35a211d4ba011fe1f4325e22e61a4ae 100644
--- a/test/freeflow/navierstokes/test_navierstokes.input
+++ b/test/freeflow/navierstokes/test_navierstokes.input
@@ -6,3 +6,6 @@ TEnd = 30.0 # [s]
 [Grid]
 File = ./grids/test_navierstokes.dgf
 
+[Problem]
+EnableGravity = 0 # Disable gravity
+
diff --git a/test/freeflow/stokes/stokestestproblem.hh b/test/freeflow/stokes/stokestestproblem.hh
index 8f0ac82b33abf34bd2d3c1bda603842343f95bc8..9014e768f75be22702f221b6a3e783ca814619b9 100644
--- a/test/freeflow/stokes/stokestestproblem.hh
+++ b/test/freeflow/stokes/stokestestproblem.hh
@@ -59,14 +59,8 @@ public:
 //! Scalar is set to type long double for higher accuracy
 SET_TYPE_PROP(BoxStokes, Scalar, double);
 
-//! A stabilization factor. Set negative for stabilization and to zero for no stabilization
-SET_SCALAR_PROP(StokesTestProblem, StokesStabilizationAlpha, -1.0);
-
-//! Disable unsymmetrized velecoity gradient by default
+//! Disable unsymmetrized velocity gradient by default
 SET_BOOL_PROP(StokesTestProblem, EnableUnsymmetrizedVelocityGradient, false);
-
-//! Disable gravity by default
-SET_BOOL_PROP(StokesTestProblem, ProblemEnableGravity, false);
 }
 
 /*!
diff --git a/test/freeflow/stokes/test_stokes.input b/test/freeflow/stokes/test_stokes.input
index 6d4f501e0489480c6348f0af54bc0e04a8758ab3..915a9cdb91c8d3810f9d67aa8a7cb93bb15eaad2 100644
--- a/test/freeflow/stokes/test_stokes.input
+++ b/test/freeflow/stokes/test_stokes.input
@@ -5,3 +5,9 @@ TEnd = 6e3 # [s]
 [Grid]
 File = ./grids/test_stokes.dgf
 
+[Stokes]
+StabilizationAlpha = -1.0 # a stabilization factor. Set negative for stabilization and to zero for no stabilization
+
+[Problem]
+EnableGravity = 0 # disable gravity
+
diff --git a/test/freeflow/stokes2c/stokes2ctestproblem.hh b/test/freeflow/stokes2c/stokes2ctestproblem.hh
index 9ce7b1ecc59b70d93797f5884d1a70023a1d5b1a..6bb49576758aeb2abbf16a2907673679517e0618 100644
--- a/test/freeflow/stokes2c/stokes2ctestproblem.hh
+++ b/test/freeflow/stokes2c/stokes2ctestproblem.hh
@@ -57,12 +57,6 @@ SET_PROP(BoxStokesnc, FluidSystem)
 
 //! Scalar is set to type long double for higher accuracy
 //SET_TYPE_PROP(BoxStokes, Scalar, long double);
-
-//! a stabilization factor. Set to zero for no stabilization
-SET_SCALAR_PROP(BoxStokesnc, StokesStabilizationAlpha, -1.0e3);
-
-// Enable gravity
-SET_BOOL_PROP(Stokes2cTestProblem, ProblemEnableGravity, false);
 }
 
 /*!
diff --git a/test/freeflow/stokes2c/test_stokes2c.input b/test/freeflow/stokes2c/test_stokes2c.input
index 801293a244ba7749d3e15381ef3de5b8799a7bfa..b68a2c90a5c3b4704a39b72f856c556ef343decd 100644
--- a/test/freeflow/stokes2c/test_stokes2c.input
+++ b/test/freeflow/stokes2c/test_stokes2c.input
@@ -5,3 +5,9 @@ TEnd = 2 # [s]
 [Grid]
 File = ./grids/test_stokes2c.dgf
 
+[Stokes]
+StabilizationAlpha = -1.0e3 # a stabilization factor. Set to zero for no stabilization
+
+[Problem]
+EnableGravity = 0 # disable gravity
+
diff --git a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
index 61d3348b901e059b4a0a32833360157c794f798e..cc79518beaacb62ce879e076ebfbb71486b91619 100644
--- a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
+++ b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
@@ -69,12 +69,6 @@ SET_TYPE_PROP(Stokes2cniTestProblem, LinearSolver, UMFPackBackend<TypeTag>);
 #if HAVE_PARDISO
 SET_TYPE_PROP(Stokes2cniTestProblem, LinearSolver, PardisoBackend<TypeTag>);
 #endif
-
-//! a stabilization factor. Set to zero for no stabilization
-SET_SCALAR_PROP(Stokes2cniTestProblem, StokesStabilizationAlpha, -1.0);
-
-// Enable gravity
-SET_BOOL_PROP(Stokes2cniTestProblem, ProblemEnableGravity, true);
 }
 
 /*!
diff --git a/test/freeflow/stokes2cni/test_stokes2cni.input b/test/freeflow/stokes2cni/test_stokes2cni.input
index 9396effa6c971b459c410b364e8b8c376c18faa1..d24eda3758d30dc58dbb7aae00eef0f2cdcaa7b6 100644
--- a/test/freeflow/stokes2cni/test_stokes2cni.input
+++ b/test/freeflow/stokes2cni/test_stokes2cni.input
@@ -5,3 +5,6 @@ TEnd = 3 # [s]
 [Grid]
 File = ./grids/test_stokes2cni.dgf
 
+[Stokes]
+StabilizationAlpha = -1.0 # a stabilization factor. Set to zero for no stabilization
+