diff --git a/bin/foamRunTutorials b/bin/foamRunTutorials
index dac6fc894f..df8f148ca5 100755
--- a/bin/foamRunTutorials
+++ b/bin/foamRunTutorials
@@ -51,6 +51,7 @@ do
     case "$1" in
     -t | -test)
         passArgs="-test"
+        runTests=true
         shift
         ;;
     -s | -skipFirst)
@@ -64,10 +65,14 @@ do
 done
 
 # If an argument is supplied do not execute ./Allrun to avoid recursion
-if ! $skipFirst && [ -f "./Allrun" ]
+if ! $skipFirst && $runTests && [ -f "./Alltest" ]
+then
+    # Run speciallised Alltest script.
+    ./Alltest $passArgs $*
+elif ! $skipFirst && [ -f "./Allrun" ]
 then
     # Run specialised Allrun script.
-    ./Allrun $passArgs
+    ./Allrun $passArgs $*
 elif [ -d system ]
 then
     # Run normal case.
@@ -89,7 +94,7 @@ else
     # Run all cases which have not already been run
     $make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs \
           FOAM_TARGETS="$FOAM_TARGETS" \
-          FOAM_APP="$thisScript" FOAM_ARGS="$passArgs"
+          FOAM_APP="$thisScript" FOAM_ARGS="$passArgs $*"
 fi
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/Allrun b/tutorials/Allrun
index 28e4fe6a45..bf468c143e 100755
--- a/tutorials/Allrun
+++ b/tutorials/Allrun
@@ -124,7 +124,7 @@ logReport()
 if [ -z "$optCollectOnly" ]
 then
     # Recursively run all tutorials
-    foamRunTutorials -test -skipFirst
+    foamRunTutorials -skipFirst $*
 fi
 
 
diff --git a/tutorials/Alltest b/tutorials/Alltest
index f192361942..39da77fb7a 100755
--- a/tutorials/Alltest
+++ b/tutorials/Alltest
@@ -244,7 +244,7 @@ fi
 
 
 cp -f $FOAM_TUTORIALS/Allrun .
-./Allrun
+./Allrun -test
 
 sed -e :a -e '/\\$/N; s/\\\n//; ta' Allrun > temp
 APPLICATIONS=\
diff --git a/tutorials/IO/fileHandler/Alltest b/tutorials/IO/fileHandler/Alltest
new file mode 100755
index 0000000000..98f9166d69
--- /dev/null
+++ b/tutorials/IO/fileHandler/Alltest
@@ -0,0 +1,16 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Reset the controlDict
+if [ -f system/controlDict.orig ]
+then
+    echo "$0: restoring the controlDict from controlDict.orig"
+    mv system/controlDict.orig system/controlDict
+fi
+
+./Allrun
+
+#------------------------------------------------------------------------------