diff --git a/dumux/freeflow/staggerednc/fluxvariables.hh b/dumux/freeflow/staggerednc/fluxvariables.hh
index d434644d171dc2cd0f3b23c02b19d12e3591378d..ae4a1c6574fc62824519dc7137bf5c5fd55f838c 100644
--- a/dumux/freeflow/staggerednc/fluxvariables.hh
+++ b/dumux/freeflow/staggerednc/fluxvariables.hh
@@ -48,13 +48,10 @@ NEW_PROP_TAG(EnableInertiaTerms);
  *        specializations are provided for combinations of physical processes
  * \note  Not all specializations are currently implemented
  */
-// template<class TypeTag>
-// using FreeFlowFluxVariables = FreeFlowFluxVariablesImpl<TypeTag, GET_PROP_VALUE(TypeTag, EnableComponentTransport),
-//                                                                  GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>;
 
 // specialization for miscible, isothermal flow
 template<class TypeTag>
-class FreeFlowFluxVariablesImpl<TypeTag, true, false> : public FreeFlowFluxVariablesImpl<TypeTag, false, false>
+class FreeFlowFluxVariablesImpl<TypeTag, true> : public FreeFlowFluxVariablesImpl<TypeTag, false>
 {
     using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
     using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -81,7 +78,7 @@ class FreeFlowFluxVariablesImpl<TypeTag, true, false> : public FreeFlowFluxVaria
     //! The index of the component balance equation that gets replaced with the total mass balance
     static const int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
 
-    using ParentType = FreeFlowFluxVariablesImpl<TypeTag, false, false>;
+    using ParentType = FreeFlowFluxVariablesImpl<TypeTag, false>;
 
     enum {
          // grid and world dimension
diff --git a/dumux/freeflow/staggerednc/localresidual.hh b/dumux/freeflow/staggerednc/localresidual.hh
index 0a8786a7c96cef4b2dcc3490ecf8c8dbbde9dc87..5df84900495206ff41ab38af67f75c273aed9af7 100644
--- a/dumux/freeflow/staggerednc/localresidual.hh
+++ b/dumux/freeflow/staggerednc/localresidual.hh
@@ -53,12 +53,12 @@ NEW_PROP_TAG(ReplaceCompEqIdx);
 
 
 // // forward declaration
-template<class TypeTag, bool enableComponentTransport, bool enableEnergyBalance>
+template<class TypeTag, bool enableComponentTransport>
 class StaggeredNavierStokesResidualImpl;
 
 // specialization for miscible, isothermal flow
 template<class TypeTag>
-class StaggeredNavierStokesResidualImpl<TypeTag, true, false> : public StaggeredNavierStokesResidualImpl<TypeTag, false, false>
+class StaggeredNavierStokesResidualImpl<TypeTag, true> : public StaggeredNavierStokesResidualImpl<TypeTag, false>
 {
     friend class StaggeredLocalResidual<TypeTag>;
 
diff --git a/dumux/freeflow/staggerednc/model.hh b/dumux/freeflow/staggerednc/model.hh
index 040319ebe8c333f27285f2442f3b0f13cdc26fc9..1805487164974d27480fa8e75f2fa63464b9807a 100644
--- a/dumux/freeflow/staggerednc/model.hh
+++ b/dumux/freeflow/staggerednc/model.hh
@@ -30,6 +30,7 @@
 // #include <dumux/porousmediumflow/implicit/velocityoutput.hh>
 #include "properties.hh"
 #include "../staggered/model.hh"
+#include "../staggeredni/model.hh"
 
 namespace Dumux
 {
diff --git a/dumux/freeflow/staggerednc/properties.hh b/dumux/freeflow/staggerednc/properties.hh
index b50ad8f482bd441412ca7929cb708bc8c700c38a..4fdcc281361f1e882df54be7320fbfc3c67ead3b 100644
--- a/dumux/freeflow/staggerednc/properties.hh
+++ b/dumux/freeflow/staggerednc/properties.hh
@@ -27,8 +27,8 @@
 #ifndef DUMUX_NAVIERSTOKES_NC_PROPERTIES_HH
 #define DUMUX_NAVIERSTOKES_NC_PROPERTIES_HH
 
-// #include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
 #include <dumux/freeflow/staggered/properties.hh>
+#include <dumux/freeflow/staggeredni/properties.hh>
 
 namespace Dumux
 {
@@ -44,9 +44,7 @@ namespace Properties {
 
 //! The type tags for the implicit single-phase problems
 NEW_TYPE_TAG(NavierStokesNC, INHERITS_FROM(NavierStokes));
-
-//! The type tags for the corresponding non-isothermal problems
-// NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes, NonIsothermal));
+NEW_TYPE_TAG(NavierStokesNCNI, INHERITS_FROM(NavierStokesNC, NavierStokesNonIsothermal));
 
 //////////////////////////////////////////////////////////////////
 // Property tags
diff --git a/dumux/freeflow/staggerednc/propertydefaults.hh b/dumux/freeflow/staggerednc/propertydefaults.hh
index 329c732640e82b090666cd0bb0b8e95d63088645..efa9b6cad4af386ff69fc0859b98cd306bb86239 100644
--- a/dumux/freeflow/staggerednc/propertydefaults.hh
+++ b/dumux/freeflow/staggerednc/propertydefaults.hh
@@ -35,7 +35,6 @@
 #include "localresidual.hh"
 #include "fluxvariables.hh"
 #include "../staggered/problem.hh"
-// #include "../staggered/model.hh"
 #include "../staggered/propertydefaults.hh"
 
 
@@ -127,7 +126,7 @@ SET_INT_PROP(NavierStokesNC, PhaseIdx, 0); //!< Defines the phaseIdx
 //////////////////////////////////////////////////////////////////
 
 // set isothermal Model
-// SET_TYPE_PROP(NavierStokesNI, IsothermalModel, NavierStokesModel<TypeTag>);
+SET_TYPE_PROP(NavierStokesNCNI, IsothermalModel, NavierStokesNCModel<TypeTag>);
 
 //set isothermal VolumeVariables
 // SET_TYPE_PROP(NavierStokesNI, IsothermalVolumeVariables, NavierStokesVolumeVariables<TypeTag>);
diff --git a/test/freeflow/staggerednc/CMakeLists.txt b/test/freeflow/staggerednc/CMakeLists.txt
index 7cc0a78bbbde7366cc2783196136a442887a5d58..4e6577cea9579fed185a4bfbfb94bf2e575f8041 100644
--- a/test/freeflow/staggerednc/CMakeLists.txt
+++ b/test/freeflow/staggerednc/CMakeLists.txt
@@ -22,6 +22,14 @@ add_dumux_test(test_advection test_channel test_channel.cc
                          ${CMAKE_CURRENT_BINARY_DIR}/test_advection-00009.vtu
                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_advection.input")
 
+add_dumux_test(test_stokes2cni test_stokes2cni test_channel.cc
+               python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+                 --script fuzzy
+                 --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-advection.vtu
+                         ${CMAKE_CURRENT_BINARY_DIR}/test_advection-00002.vtu
+                 --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_advection.input")
+target_compile_definitions(test_stokes2cni PUBLIC "NONISOTHERMAL=1")
+
 
 #install sources
 install(FILES
diff --git a/test/freeflow/staggerednc/channeltestproblem.hh b/test/freeflow/staggerednc/channeltestproblem.hh
index de87e0c3eaa124018fddbde3f9c0c3272fa3002a..097cb4df718f345cc8a62edd29102a2778686534 100644
--- a/test/freeflow/staggerednc/channeltestproblem.hh
+++ b/test/freeflow/staggerednc/channeltestproblem.hh
@@ -45,7 +45,12 @@ namespace Capabilities
 
 namespace Properties
 {
+
+#if !NONISOTHERMAL
 NEW_TYPE_TAG(ChannelNCTestProblem, INHERITS_FROM(StaggeredModel, NavierStokesNC));
+#else
+NEW_TYPE_TAG(ChannelNCTestProblem, INHERITS_FROM(StaggeredModel, NavierStokesNCNI));
+#endif
 
 NEW_PROP_TAG(FluidSystem);