diff --git a/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allclean b/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allclean
index 204f58f154..0b120bad2c 100755
--- a/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allclean
+++ b/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allclean
@@ -4,6 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cleanCase && rm -rf pitzDailySteady constant system/controlDict system/fv*
+cleanCase && rm -rf pitzDailySteady constant
+
+find system -type f -not \( \
+    -name blockMeshDict -or -name decomposeParDict -or -name mapFieldsDict \
+    \) -delete
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allrun-parallel b/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allrun-parallel
index a4eec4eafb..766cb58364 100755
--- a/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allrun-parallel
+++ b/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allrun-parallel
@@ -8,8 +8,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Copy the source case
 isTest "$@" && path=.. || path=$FOAM_TUTORIALS/incompressibleFluid
 cp -r $path/pitzDailySteady/constant .
-cp -r $path/pitzDailySteady/system/controlDict system
-cp -r $path/pitzDailySteady/system/fv* system
+cp -rn $path/pitzDailySteady/system/* system
 cp -r $path/pitzDailySteady .
 
 # Run the source case in parallel
@@ -19,7 +18,7 @@ cp -r $path/pitzDailySteady .
     cp ../system/decomposeParDict system
     runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/pitzDaily
     runApplication decomposePar
-    runParallel foamRun
+    runParallel foamRun -noFunctionObjects
 )
 
 # Mesh
@@ -38,7 +37,7 @@ runApplication decomposePar
 #
 runParallel mapFieldsPar pitzDailySteady -sourceTime latestTime -fields "(epsilon k nut p U)"
 runApplication foamDictionary system/fvSolution -entry relaxationFactors/equations -set '{ ".*" 0.1; }'
-runParallel foamRun
+runParallel foamRun -noFunctionObjects
 
 # Reconstruct, including the values mapped to the zero directory
 runApplication reconstructPar -withZero
diff --git a/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allrun-serial b/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allrun-serial
index 530788e7dc..82b505f142 100755
--- a/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allrun-serial
+++ b/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allrun-serial
@@ -8,15 +8,15 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Copy the source case
 isTest "$@" && path=.. || path=$FOAM_TUTORIALS/incompressibleFluid
 cp -r $path/pitzDailySteady/constant .
-cp -r $path/pitzDailySteady/system/controlDict system
-cp -r $path/pitzDailySteady/system/fv* system
+cp -rn $path/pitzDailySteady/system/* system
 cp -r $path/pitzDailySteady .
 
 # Run the source case
 (
     cd pitzDailySteady
     isTest "$@" && cleanCase
-    ./Allrun
+    runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/pitzDaily
+    runApplication foamRun -noFunctionObjects
 )
 
 # Mesh
@@ -34,6 +34,6 @@ runApplication blockMesh
 #
 runApplication mapFieldsPar pitzDailySteady -sourceTime latestTime -fields "(epsilon k nut p U)"
 runApplication foamDictionary system/fvSolution -entry relaxationFactors/equations -set '{ ".*" 0.1; }'
-runApplication foamRun
+runApplication foamRun -noFunctionObjects
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allrun-parallel b/tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allrun-parallel
index 055fc26311..b30e4d2360 100755
--- a/tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allrun-parallel
+++ b/tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allrun-parallel
@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Copy the source case
 isTest "$@" && path=.. || path=$FOAM_TUTORIALS/incompressibleFluid
 cp -r $path/pitzDailySteady/constant .
-cp -r $path/pitzDailySteady/system/* system
+cp -rn $path/pitzDailySteady/system/* system
 cp -r $path/pitzDailySteady .
 
 # Run the source case in parallel
@@ -18,7 +18,7 @@ cp -r $path/pitzDailySteady .
     cp ../system/decomposeParDict system
     runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/pitzDaily
     runApplication decomposePar
-    runParallel foamRun
+    runParallel foamRun -noFunctionObjects
 )
 
 # Mesh
@@ -27,7 +27,7 @@ runApplication decomposePar
 
 # Map from the source case into this case and run
 runParallel mapFieldsPar pitzDailySteady -consistent -sourceTime latestTime
-runParallel foamRun
+runParallel foamRun -noFunctionObjects
 
 # Reconstruct, including the values mapped to the zero directory
 runApplication reconstructPar -withZero
diff --git a/tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allrun-serial b/tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allrun-serial
index 90262fb153..6d3e35d966 100755
--- a/tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allrun-serial
+++ b/tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allrun-serial
@@ -8,14 +8,15 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Copy the source case
 isTest "$@" && path=.. || path=$FOAM_TUTORIALS/incompressibleFluid
 cp -r $path/pitzDailySteady/constant .
-cp -r $path/pitzDailySteady/system/* system
+cp -rn $path/pitzDailySteady/system/* system
 cp -r $path/pitzDailySteady .
 
 # Run the source case
 (
     cd pitzDailySteady
     isTest "$@" && cleanCase
-    ./Allrun
+    runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/pitzDaily
+    runApplication foamRun -noFunctionObjects
 )
 
 # Mesh
@@ -23,6 +24,6 @@ cp -r $path/pitzDailySteady .
 
 # Map from the source case into this case and run
 runApplication mapFieldsPar pitzDailySteady -consistent -sourceTime latestTime
-runApplication foamRun
+runApplication foamRun -noFunctionObjects
 
 #------------------------------------------------------------------------------