diff --git a/test/freeflow/staggerednc/channeltestproblem.hh b/test/freeflow/staggerednc/channeltestproblem.hh
index e5f6102cc609a8ee142d3b6cbfe008bd3aed9496..9a4eae8cc2b3e0eaaa7a5f07fea106a28a20349d 100644
--- a/test/freeflow/staggerednc/channeltestproblem.hh
+++ b/test/freeflow/staggerednc/channeltestproblem.hh
@@ -51,7 +51,7 @@ NEW_PROP_TAG(FluidSystem);
 
 // Select the fluid system
 SET_TYPE_PROP(ChannelNCTestProblem, FluidSystem,
-              FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)/*, SimpleH2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, false*/>);
+              FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)/*, SimpleH2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, true*/>);
 
 SET_PROP(ChannelNCTestProblem, PhaseIdx)
 {
@@ -205,18 +205,24 @@ public:
     {
         BoundaryTypes values;
 
-        // set Dirichlet values for the velocity everywhere
-        values.setDirichlet(momentumBalanceIdx);
-        values.setNeumann(transportEqIdx);
-        values.setNeumann(massBalanceIdx);
-
         if(isInlet(globalPos))
+        {
+            values.setDirichlet(momentumBalanceIdx);
+            values.setOutflow(massBalanceIdx);
             values.setDirichlet(transportEqIdx);
-
-        if (isOutlet(globalPos))
+        }
+        else if(isOutlet(globalPos))
         {
-            values.setDirichlet(massBalanceIdx);
             values.setOutflow(momentumBalanceIdx);
+            values.setDirichlet(massBalanceIdx);
+            values.setOutflow(transportEqIdx);
+        }
+
+        else
+        {
+            // set Dirichlet values for the velocity everywhere
+            values.setDirichlet(momentumBalanceIdx);
+            values.setOutflow(massBalanceIdx);
             values.setOutflow(transportEqIdx);
         }
 
@@ -234,10 +240,13 @@ public:
         BoundaryValues values;
 
         values[pressureIdx] = 1.1e+5;
-        values[transportCompIdx] = 1e-3;
+        values[transportCompIdx] = 0.0;
 
         if(isInlet(globalPos))
+        {
+            values[transportCompIdx] = 1e-3;
             values[velocityXIdx] = inletVelocity_;
+        }
         else
             values[velocityXIdx] = 0.0;