diff --git a/examples/freeflowchannel/params.input b/examples/freeflowchannel/params.input
index 623d2f8e566d9b8f97870da5fd356ee16859b3c2..7f6dd452d7b44881c1e0d34fd489cffd999a537f 100644
--- a/examples/freeflowchannel/params.input
+++ b/examples/freeflowchannel/params.input
@@ -18,3 +18,6 @@ MaxRelativeShift = 1e-8
 
 [Vtk]
 WriteFaceData = false
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/examples/freeflowchannel/problem.hh b/examples/freeflowchannel/problem.hh
index ed780c4d2d76d9af1c8f45eb8a2fabc01cb29d98..d12d8058a96b710a8496348f19a1b0fbf7984779 100644
--- a/examples/freeflowchannel/problem.hh
+++ b/examples/freeflowchannel/problem.hh
@@ -135,13 +135,6 @@ public:
     }
     // [[/codeblock]]
 
-    // #### Temperature distribution
-    // We need to specify a constant temperature for our isothermal problem.
-    // Fluid properties that depend on temperature will be calculated with this value.
-    // This would be important if another fluidsystem was used.
-    Scalar temperature() const
-    { return 273.15 + 10; }
-
 // The inlet is on the left side of the physical domain.
 // [[codeblock]]
 private:
diff --git a/examples/liddrivencavity/params_re1.input b/examples/liddrivencavity/params_re1.input
index 3dc7e70ec11dfa4de89dc4cfebf077afd3ad940e..bf0417e14827ca10786ec893a88f87ec41139ea1 100644
--- a/examples/liddrivencavity/params_re1.input
+++ b/examples/liddrivencavity/params_re1.input
@@ -24,3 +24,6 @@ MaxRelativeShift = 1e-5
 
 [Vtk]
 WriteFaceData = false
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/examples/liddrivencavity/params_re1000.input b/examples/liddrivencavity/params_re1000.input
index c8b78fb85136d44d5863571c897db43a2392d292..1541e194decfc1ba90fcff47089a6f93d4a3837f 100644
--- a/examples/liddrivencavity/params_re1000.input
+++ b/examples/liddrivencavity/params_re1000.input
@@ -27,3 +27,6 @@ WriteFaceData = false
 
 [Flux]
 UpwindWeight = 0.5 # set to 0.5 for reproducing Ghia et al. (1982)
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/examples/liddrivencavity/problem.hh b/examples/liddrivencavity/problem.hh
index 9d6ecc46930504e1de96c81d496f57340943d87e..a56013265e39d395adba088ba365ef7b0402af2c 100644
--- a/examples/liddrivencavity/problem.hh
+++ b/examples/liddrivencavity/problem.hh
@@ -74,13 +74,6 @@ public:
     }
     // [[/codeblock]]
 
-    // #### Temperature distribution
-    // We need to specify a constant temperature for our isothermal problem.
-    // Fluid properties that depend on temperature will be calculated with this value.
-    // This would be important if another fluidsystem was used.
-    Scalar temperature() const
-    { return 273.15 + 10; } // 10°C
-
     // #### Boundary conditions
     // With the following function we define the __type of boundary conditions__ depending on the location.
     // Three types of boundary conditions can be specified: Dirichlet or Neumann boundary conditions. On
diff --git a/test/freeflow/navierstokes/angeli/params.input b/test/freeflow/navierstokes/angeli/params.input
index d475e9a494ddf6156488821be822ffaf45bf8673..a393fd21bd74440ce38a9bf2910da4ec51eca9aa 100644
--- a/test/freeflow/navierstokes/angeli/params.input
+++ b/test/freeflow/navierstokes/angeli/params.input
@@ -26,3 +26,6 @@ MaxRelativeShift = 1e-5
 
 [Vtk]
 WriteFaceData = false
+
+[SpatialParams]
+Temperature = 293.15
diff --git a/test/freeflow/navierstokes/angeli/problem.hh b/test/freeflow/navierstokes/angeli/problem.hh
index 546a89f2b04e13a3f7c338d0e9ed25100f7a8721..43f667b004f6f81771b0864d33f53b5d72e53e0e 100644
--- a/test/freeflow/navierstokes/angeli/problem.hh
+++ b/test/freeflow/navierstokes/angeli/problem.hh
@@ -83,13 +83,6 @@ public:
         interpolateExactVelocity_ = getParam<bool>("Problem.InterpolateExactVelocity", false);
     }
 
-    /*!
-     * \brief Returns the temperature within the domain in [K].
-     * This problem assumes a temperature of 20 degrees Celsius (unused)
-     */
-    Scalar temperature() const
-    { return 293.15; }
-
     /*!
      * \name Boundary conditions
      */
diff --git a/test/freeflow/navierstokes/channel/1d/params.input b/test/freeflow/navierstokes/channel/1d/params.input
index af9175762c5163e5fe48113e9af98b6baf9245e3..593911a5e8e62dd63d02ddfc6ce2394123bd3e3f 100644
--- a/test/freeflow/navierstokes/channel/1d/params.input
+++ b/test/freeflow/navierstokes/channel/1d/params.input
@@ -18,3 +18,6 @@ MaxRelativeShift = 1e-9
 
 [Vtk]
 WriteFaceData = false
+
+[SpatialParams]
+Temperature = 298.0
diff --git a/test/freeflow/navierstokes/channel/1d/problem.hh b/test/freeflow/navierstokes/channel/1d/problem.hh
index fa0de2599a712d4fefffcefcb5f08290af908f10..deec5b721c08329a03eda39de66b01f0f7e724f5 100644
--- a/test/freeflow/navierstokes/channel/1d/problem.hh
+++ b/test/freeflow/navierstokes/channel/1d/problem.hh
@@ -73,13 +73,7 @@ public:
         kinematicViscosity_ = getParam<Scalar>("Component.LiquidKinematicViscosity");
     }
 
-   /*!
-     * \brief Returns the temperature within the domain in [K].
-     */
-    Scalar temperature() const
-    { return 298.0; }
-
-   /*!
+    /*!
      * \brief Returns the sources within the domain.
      *
      * \param globalPos The global position
@@ -129,12 +123,12 @@ public:
         return source;
     }
     // \}
-   /*!
+    /*!
      * \name Boundary conditions
      */
     // \{
 
-   /*!
+    /*!
      * \brief Specifies which kind of boundary condition should be
      *        used for which equation on a given boundary control volume.
      *
@@ -155,7 +149,7 @@ public:
         return values;
     }
 
-   /*!
+    /*!
      * \brief Returns Dirichlet boundary values at a given position
      *
      * \param globalPos The global position
diff --git a/test/freeflow/navierstokes/channel/2d/problem.hh b/test/freeflow/navierstokes/channel/2d/problem.hh
index 1529068135fe2a70a9408ba432b76f9d7af71b0c..bcde26ecb9b1602056df2bc2a99517d7791acad4 100644
--- a/test/freeflow/navierstokes/channel/2d/problem.hh
+++ b/test/freeflow/navierstokes/channel/2d/problem.hh
@@ -102,16 +102,7 @@ public:
         outletPressure_ = getParam<Scalar>("Problem.OutletPressure", 1.1e5);
     }
 
-   /*!
-     * \brief Returns the temperature within the domain in [K].
-     *
-     * This problem assumes a temperature of 10 degrees Celsius.
-     */
-    Scalar temperature() const
-    { return 273.15 + 10; } // 10C
-
-    // \}
-   /*!
+    /*!
      * \name Boundary conditions
      */
     // \{
diff --git a/test/freeflow/navierstokes/channel/3d/problem.hh b/test/freeflow/navierstokes/channel/3d/problem.hh
index 4de11aecaf918e4b9bbe4593bcf6063c54f41964..403a1d59bc029a0c0cd368280cd26aa9f0936f2d 100644
--- a/test/freeflow/navierstokes/channel/3d/problem.hh
+++ b/test/freeflow/navierstokes/channel/3d/problem.hh
@@ -94,15 +94,6 @@ public:
      */
     // \{
 
-    /*!
-     * \brief Returns the temperature within the domain in [K].
-     *
-     * This problem assumes a temperature of 10 degrees Celsius.
-     */
-    Scalar temperature() const
-    { return 273.15 + 10; } // 10C
-
-
     /*!
      * \brief Evaluates the source term for all phases within a given
      *        sub-control volume
@@ -126,6 +117,7 @@ public:
     }
 
     // \}
+
     /*!
      * \name Boundary conditions
      */
diff --git a/test/freeflow/navierstokes/channel/pipe/params.input b/test/freeflow/navierstokes/channel/pipe/params.input
index 66b549898c5ff69a86d5b5125ea5f657adef2aea..f1c7f2d3487c0e180f532e3c21aece2eeedddcfd 100644
--- a/test/freeflow/navierstokes/channel/pipe/params.input
+++ b/test/freeflow/navierstokes/channel/pipe/params.input
@@ -22,3 +22,6 @@ AddVelocity = 1
 
 [Assembly]
 NumericDifference.BaseEpsilon =  1e-3
+
+[SpatialParams]
+Temperature = 293.15
diff --git a/test/freeflow/navierstokes/channel/pipe/problem.hh b/test/freeflow/navierstokes/channel/pipe/problem.hh
index f32718012d458bbdc1ad4d27dd10c8f641e3f9b6..e03753c79d014a77e93f43878b2e86a6edeaebdf 100644
--- a/test/freeflow/navierstokes/channel/pipe/problem.hh
+++ b/test/freeflow/navierstokes/channel/pipe/problem.hh
@@ -78,9 +78,6 @@ public:
         return name_;
     }
 
-    Scalar temperature() const
-    { return 293.15; }
-
     /*!
      * \brief Specifies which kind of boundary condition should be
      *        used for which equation on a given boundary segment.
diff --git a/test/freeflow/navierstokes/donea/params.input b/test/freeflow/navierstokes/donea/params.input
index 224ffc14c323985af08306184bd4349d9f946518..20acc796b968ed3fbe3d5e33e068b0c0e8d05ff8 100644
--- a/test/freeflow/navierstokes/donea/params.input
+++ b/test/freeflow/navierstokes/donea/params.input
@@ -30,3 +30,6 @@ AmgAccumulationMode = atOnce
 
 [Assembly]
 NumericDifference.BaseEpsilon = 1e-8
+
+[SpatialParams]
+Temperature = 298.0
diff --git a/test/freeflow/navierstokes/donea/problem.hh b/test/freeflow/navierstokes/donea/problem.hh
index d1bb8694ee686fba4a57589a08ea8370547fb654..d00ef321653b81849f94ba5e884a0bb600053d6f 100644
--- a/test/freeflow/navierstokes/donea/problem.hh
+++ b/test/freeflow/navierstokes/donea/problem.hh
@@ -82,8 +82,6 @@ public:
      */
     // \{
 
-    Scalar temperature() const { return 298.0; }
-
     /*!
      * \brief Return the sources within the domain.
      *
diff --git a/test/freeflow/navierstokes/kovasznay/params.input b/test/freeflow/navierstokes/kovasznay/params.input
index 40308482059a6f2d12bef4ab36874c38aedb1faa..59ff3366c30719b4df85c146a201b6bacda61770 100644
--- a/test/freeflow/navierstokes/kovasznay/params.input
+++ b/test/freeflow/navierstokes/kovasznay/params.input
@@ -26,3 +26,6 @@ WriteFaceData = false
 
 [Flux]
 UpwindWeight = 0.5
+
+[SpatialParams]
+Temperature = 298.0
diff --git a/test/freeflow/navierstokes/kovasznay/problem.hh b/test/freeflow/navierstokes/kovasznay/problem.hh
index ac293f4bd65e6cd75d1c41e59c99d2d59df83022..c323d490f590b02b9d782b3952c54c627d6ee853 100644
--- a/test/freeflow/navierstokes/kovasznay/problem.hh
+++ b/test/freeflow/navierstokes/kovasznay/problem.hh
@@ -76,21 +76,12 @@ public:
                         - std::sqrt(reynoldsNumber * reynoldsNumber * 0.25 + 4.0 * M_PI * M_PI);
     }
 
-   /*!
-     * \brief Returns the temperature within the domain in [K].
-     *
-     * This problem assumes a temperature of 10 degrees Celsius.
-     */
-    Scalar temperature() const
-    { return 298.0; }
-
-    // \}
-   /*!
+    /*!
      * \name Boundary conditions
      */
     // \{
 
-   /*!
+    /*!
      * \brief Specifies which kind of boundary condition should be
      *        used for which equation on a given boundary control volume.
      *
diff --git a/test/freeflow/navierstokes/periodic/params.input b/test/freeflow/navierstokes/periodic/params.input
index a39a3b07644068cda87a14592323ccd050ff7f71..f73e3b13efcaf6edaaa3510af5a178ce35640b2f 100644
--- a/test/freeflow/navierstokes/periodic/params.input
+++ b/test/freeflow/navierstokes/periodic/params.input
@@ -25,3 +25,6 @@ UpwindWeight = 0.5
 
 [Assembly]
 NumericDifference.BaseEpsilon = 1e-4
+
+[SpatialParams]
+Temperature = 298.0
diff --git a/test/freeflow/navierstokes/periodic/problem.hh b/test/freeflow/navierstokes/periodic/problem.hh
index 395b64a66b6ecfbb4d4d14620cbc647c933ad582..f65281d09e680233f9947b2a07ef8fca8d46c238 100644
--- a/test/freeflow/navierstokes/periodic/problem.hh
+++ b/test/freeflow/navierstokes/periodic/problem.hh
@@ -65,20 +65,6 @@ public:
         usePressureDifference_ = getParam<bool>("Problem.UsePressureDifference", false);
     }
 
-    /*!
-     * \name Problem parameters
-     */
-    // \{
-
-    /*!
-     * \brief Returns the temperature within the domain in [K].
-     *
-     * This problem assumes a temperature of 10 degrees Celsius.
-     */
-    Scalar temperature() const
-    { return 298.0; }
-
-    // \}
     /*!
      * \name Boundary conditions
      */
diff --git a/test/freeflow/navierstokes/sincos/params.input b/test/freeflow/navierstokes/sincos/params.input
index 9d5dfa0eba708e2e27ec2e1f3a1b7ab703e5a1db..8855fb9260907203b3918f6277b92742058f5fe8 100644
--- a/test/freeflow/navierstokes/sincos/params.input
+++ b/test/freeflow/navierstokes/sincos/params.input
@@ -45,3 +45,6 @@ GMResRestart = 50
 Type = uzawa
 Verbosity = 1
 Iterations = 5
+
+[SpatialParams]
+Temperature = 298.0
diff --git a/test/freeflow/navierstokes/sincos/problem.hh b/test/freeflow/navierstokes/sincos/problem.hh
index dc1143bc9d324414708a3b88c08fc7587630a561..e734640a9320dba1d666ff4eed6eb71172c262cd 100644
--- a/test/freeflow/navierstokes/sincos/problem.hh
+++ b/test/freeflow/navierstokes/sincos/problem.hh
@@ -76,14 +76,6 @@ public:
         useNeumann_ = getParam<bool>("Problem.UseNeumann", false);
     }
 
-   /*!
-     * \brief Returns the temperature within the domain in [K].
-     *
-     * This problem assumes a temperature of 10 degrees Celsius.
-     */
-    Scalar temperature() const
-    { return 298.0; }
-
     /*!
      * \brief Return the sources within the domain.
      *
diff --git a/test/freeflow/navierstokesnc/channel/params_advection.input b/test/freeflow/navierstokesnc/channel/params_advection.input
index 6b78690db58b1dae42caf027ac1862e2092874e4..0312d98552b9908c9cf29823c97f17e476d440f0 100644
--- a/test/freeflow/navierstokesnc/channel/params_advection.input
+++ b/test/freeflow/navierstokesnc/channel/params_advection.input
@@ -20,3 +20,6 @@ MaxRelativeShift = 1e-8
 
 [Vtk]
 WriteFaceData = false
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/navierstokesnc/channel/params_advectionni.input b/test/freeflow/navierstokesnc/channel/params_advectionni.input
index 445d411b7d603a3bbff0d38b84234e0458c69b1c..cef467f515cc7e03faa417385f9001da80ea278c 100644
--- a/test/freeflow/navierstokesnc/channel/params_advectionni.input
+++ b/test/freeflow/navierstokesnc/channel/params_advectionni.input
@@ -20,3 +20,6 @@ MaxRelativeShift = 1e-8
 
 [Vtk]
 WriteFaceData = false
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/navierstokesnc/channel/params_diffusion.input b/test/freeflow/navierstokesnc/channel/params_diffusion.input
index 1dae92d7332ab6a95e00de4d9f7163d5c30adf41..4aac5c2d70dacc5ea4b109327ba0bc8957034b6a 100644
--- a/test/freeflow/navierstokesnc/channel/params_diffusion.input
+++ b/test/freeflow/navierstokesnc/channel/params_diffusion.input
@@ -18,3 +18,6 @@ MaxRelativeShift = 1e-12
 
 [Vtk]
 WriteFaceData = false
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/navierstokesnc/channel/params_diffusionni.input b/test/freeflow/navierstokesnc/channel/params_diffusionni.input
index 0383369d9af2569df26ee75670e6121c8f51ccdb..574ec21450a123f672710707a4dc8b204af09d62 100644
--- a/test/freeflow/navierstokesnc/channel/params_diffusionni.input
+++ b/test/freeflow/navierstokesnc/channel/params_diffusionni.input
@@ -17,3 +17,6 @@ MaxRelativeShift = 1e-8
 
 [Vtk]
 WriteFaceData = false
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/navierstokesnc/channel/problem.hh b/test/freeflow/navierstokesnc/channel/problem.hh
index 3eca45c6bc3f7c5a5d4f237f8d15781423ea66ac..3cce1ceb54b8967c5f0307b358c47ae1d584d3c8 100644
--- a/test/freeflow/navierstokesnc/channel/problem.hh
+++ b/test/freeflow/navierstokesnc/channel/problem.hh
@@ -75,20 +75,6 @@ public:
         deltaP_.resize(this->gridGeometry().numCellCenterDofs());
     }
 
-   /*!
-     * \name Problem parameters
-     */
-    // \{
-
-   /*!
-     * \brief Returns the temperature within the domain in [K].
-     *
-     * This problem assumes a temperature of 10 degrees Celsius.
-     */
-    Scalar temperature() const
-    { return 273.15 + 10; } // 10C
-
-    // \}
    /*!
      * \name Boundary conditions
      */
diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh
index 81442185ddcee101bce3c4a2e14321d8f26a1512..5d562ddc242e26e5a7eb152ca9ebb11d703d5ff4 100644
--- a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh
+++ b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh
@@ -75,20 +75,6 @@ public:
         deltaRho_.resize(this->gridGeometry().numCellCenterDofs());
     }
 
-   /*!
-     * \name Problem parameters
-     */
-    // \{
-
-   /*!
-     * \brief Returns the temperature within the domain in [K].
-     *
-     * This problem assumes a temperature of 10 degrees Celsius.
-     */
-    Scalar temperature() const
-    { return 273.15 + 10; } // 10C
-
-    // \}
    /*!
      * \name Boundary conditions
      */
diff --git a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
index de92e3cbd3fdba96e2b042973172c5c0a0a3c82d..fcf13b6b3d02b7a9b43b8da269420593cc250645 100644
--- a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
+++ b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
@@ -167,16 +167,9 @@ public:
         }
     }
 
-   /*!
-     * \brief Returns the temperature within the domain in [K].
-     *
-     * This problem assumes a temperature of 10 degrees Celsius.
-     */
-    Scalar temperature() const
-    { return 273.15 + 10; } // 10C
-
     // \}
-   /*!
+
+    /*!
      * \name Boundary conditions
      */
     // \{
diff --git a/test/freeflow/rans/params.input b/test/freeflow/rans/params.input
index c090b55bd284603d9c9d59709a89cf33ae3bbcf8..7cc5cf0303c39adea2cf0d530536015191afd849 100644
--- a/test/freeflow/rans/params.input
+++ b/test/freeflow/rans/params.input
@@ -33,3 +33,6 @@ MaxRelativeShift = 1e-6
 
 [Vtk]
 WriteFaceData = false
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/rans/params_nonisothermal.input b/test/freeflow/rans/params_nonisothermal.input
index 7b2605d904ff5e8fd657def6fb6e351fe8bfcd89..4474096747ec5161e042c491f8e16f14ff26f0d7 100644
--- a/test/freeflow/rans/params_nonisothermal.input
+++ b/test/freeflow/rans/params_nonisothermal.input
@@ -35,3 +35,6 @@ MaxRelativeShift = 1e-9
 
 [Vtk]
 WriteFaceData = false
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/rans/params_nonisothermal_wallfunction.input b/test/freeflow/rans/params_nonisothermal_wallfunction.input
index 014ec9925887ed0cdcbf0a08e106406dc4555619..3ed580fc50f104e5961ea83d973c5c2af26bc254 100644
--- a/test/freeflow/rans/params_nonisothermal_wallfunction.input
+++ b/test/freeflow/rans/params_nonisothermal_wallfunction.input
@@ -35,3 +35,6 @@ MaxRelativeShift = 1e-8
 
 [Vtk]
 WriteFaceData = true
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/rans/params_wallfunction.input b/test/freeflow/rans/params_wallfunction.input
index 6c8309aad6559ebd9792ed3592237dc40f87c7ec..c74c76d9f45c7adcf8c4820ab185252afb7bb6e6 100644
--- a/test/freeflow/rans/params_wallfunction.input
+++ b/test/freeflow/rans/params_wallfunction.input
@@ -35,3 +35,6 @@ MaxRelativeShift = 1e-5
 
 [Vtk]
 WriteFaceData = true
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/rans/problem.hh b/test/freeflow/rans/problem.hh
index 73ad3d0a6d61e9e81825aac035ac2dca96812fa9..9abb8be0a8e8a10bdbdd9bd2ff91c0bd52eee267 100644
--- a/test/freeflow/rans/problem.hh
+++ b/test/freeflow/rans/problem.hh
@@ -83,7 +83,7 @@ public:
         Dumux::TurbulenceProperties<Scalar, dimWorld, true> turbulenceProperties;
         FluidState fluidState;
         fluidState.setPressure(0, 1e5);
-        fluidState.setTemperature(temperature());
+        fluidState.setTemperature(this->spatialParams().temperatureAtPos({}));
         Scalar density = FluidSystem::density(fluidState, 0);
         Scalar kinematicViscosity = FluidSystem::viscosity(fluidState, 0) / density;
         Scalar diameter = this->gridGeometry().bBoxMax()[1] - this->gridGeometry().bBoxMin()[1];
@@ -107,25 +107,12 @@ public:
         std::cout << std::endl;
     }
 
-   /*!
-     * \name Problem parameters
-     */
-    // \{
-
-   /*!
-     * \brief Returns the temperature [K] within the domain for the isothermal model.
-     */
-    Scalar temperature() const
-    { return inletTemperature_; }
-
-    // \}
-
-   /*!
+    /*!
      * \name Boundary conditions
      */
     // \{
 
-   /*!
+    /*!
      * \brief Specifies which kind of boundary condition should be
      *        used for which equation on a given boundary control volume.
      *
diff --git a/test/freeflow/ransnc/params.input b/test/freeflow/ransnc/params.input
index 8adc39df1d3ca268744b67779a318b6644b67b46..d70730785c1ef83cbacb713d6a65c44c0e70c521 100644
--- a/test/freeflow/ransnc/params.input
+++ b/test/freeflow/ransnc/params.input
@@ -32,3 +32,6 @@ NumericEpsilon.BaseEpsilon = 1e-8
 [Newton]
 MaxSteps = 8
 MaxRelativeShift = 1e-9
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/ransnc/params_nonisothermal.input b/test/freeflow/ransnc/params_nonisothermal.input
index 20baf29174c2dc44fdd088eb5ac19ae10c059c3d..537a5fe34e0c096dc3e25cf5efb69166ca8e0115 100644
--- a/test/freeflow/ransnc/params_nonisothermal.input
+++ b/test/freeflow/ransnc/params_nonisothermal.input
@@ -30,3 +30,6 @@ NumericDifferenceMethod = 0
 MaxSteps = 10
 TargetSteps = 8
 MaxRelativeShift = 1e-5
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/ransnc/params_nonisothermal_wallfunction.input b/test/freeflow/ransnc/params_nonisothermal_wallfunction.input
index 5b94e694f09452528f1a17d4fa05793860157844..af3cf60ec0d4870cd412ee20ebc131d272c491fb 100644
--- a/test/freeflow/ransnc/params_nonisothermal_wallfunction.input
+++ b/test/freeflow/ransnc/params_nonisothermal_wallfunction.input
@@ -31,3 +31,6 @@ NumericDifferenceMethod = 0
 MaxSteps = 10
 TargetSteps = 8
 MaxRelativeShift = 1e-5
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/ransnc/params_wallfunction.input b/test/freeflow/ransnc/params_wallfunction.input
index 4bab598d7e1f1679e5e1c73e4ac859f258ea5976..5713d932d0f34204a456e73aeef45d1f79e778ac 100644
--- a/test/freeflow/ransnc/params_wallfunction.input
+++ b/test/freeflow/ransnc/params_wallfunction.input
@@ -35,3 +35,6 @@ NumericEpsilon.BaseEpsilon = 1e-8
 MaxSteps = 10
 TargetSteps = 8
 MaxRelativeShift = 1e-5
+
+[SpatialParams]
+Temperature = 283.15
diff --git a/test/freeflow/ransnc/problem.hh b/test/freeflow/ransnc/problem.hh
index 6111a5da9dc382af22557c2aa8011cb43f1a325d..6e5681c3ea11da2cd31dd32d1adfa9e45999d590 100644
--- a/test/freeflow/ransnc/problem.hh
+++ b/test/freeflow/ransnc/problem.hh
@@ -89,7 +89,7 @@ public:
         FluidState fluidState;
         const auto phaseIdx = 0;
         fluidState.setPressure(phaseIdx, 1e5);
-        fluidState.setTemperature(temperature());
+        fluidState.setTemperature(this->spatialParams().temperatureAtPos({}));
         fluidState.setMassFraction(phaseIdx, phaseIdx, 1.0);
         Scalar density = FluidSystem::density(fluidState, phaseIdx);
         Scalar kinematicViscosity = FluidSystem::viscosity(fluidState, phaseIdx) / density;
@@ -105,21 +105,12 @@ public:
         std::cout << std::endl;
     }
 
-   /*!
-     * \brief Returns the temperature within the domain in [K].
-     *
-     * The isothermal problem assumes a temperature of 10 degrees Celsius.
-     */
-    Scalar temperature() const
-    { return 273.15 + 10; } // 10C
-
-    // \}
-   /*!
+    /*!
      * \name Boundary conditions
      */
     // \{
 
-   /*!
+    /*!
      * \brief Specifies which kind of boundary condition should be
      *        used for which equation on a given boundary control volume.
      *
@@ -198,7 +189,7 @@ public:
         }
 
 #if NONISOTHERMAL
-        values[Indices::temperatureIdx] = (isLowerWall_(globalPos) && time() > 10.0) ? wallTemperature_ : temperature();
+        values[Indices::temperatureIdx] = (isLowerWall_(globalPos) && time() > 10.0) ? wallTemperature_ : inletTemperature_;
 #endif
 
         return values;
@@ -235,7 +226,7 @@ public:
         values[Indices::pressureIdx] = 1.0e+5;
         values[transportCompIdx] = 0.0;
 #if NONISOTHERMAL
-        values[Indices::temperatureIdx] = temperature();
+        values[Indices::temperatureIdx] = inletTemperature_;
 #endif
         // block velocity profile
         values[Indices::velocityXIdx] = 0.0;
diff --git a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
index ab17041711b31f6d84d10f4e0aa0edb9c7f7db57..f502115f29f26edb4417d4ca58e7dac13431c1c8 100644
--- a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
+++ b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
@@ -148,9 +148,6 @@ private:
         PrimaryVariables dirichletAtPos(const GlobalPosition &globalPos) const
         { return PrimaryVariables(0.0); }
 
-        Scalar temperature() const
-        { return 300; }
-
         template<class T = TTag, bool enable = GetPropType<T, Properties::ModelTraits>::usesTurbulenceModel(), std::enable_if_t<!enable, int> = 0>
         void updateStaticWallProperties() {}