diff --git a/tutorials/Allclean b/tutorials/Allclean
index dc5e15eb376bd223c8bf01e53b694feb1b0b4f5c..40e6631bd39c501e4b1456b1fa64ace283e335d1 100755
--- a/tutorials/Allclean
+++ b/tutorials/Allclean
@@ -1,18 +1,11 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/LogFunctions    # Tutorial log-file functions
 
 echo "--------"
-echo "Cleaning tutorials ..."
-echo "Removing backup files"
-
-find . \( \
-    -name '*~' -o -name '*.bak'         \
-    -name core -o -name 'core.[1-9]*'   \
-    -name '*.pvs' -o -name '*.OpenFOAM' -name '*.foam' \
-    \) -type f -delete
-
-rm -f logs testLoopReport > /dev/null 2>&1
+removeLogs
 
+echo "Cleaning tutorials"
 foamCleanTutorials cases
 
 echo "--------"
diff --git a/tutorials/Allrun b/tutorials/Allrun
index e5e15b2993f2342f7c9f3bf55b255209ede6669c..4e923da6123d541f1c96095c8a1570a9bd647932 100755
--- a/tutorials/Allrun
+++ b/tutorials/Allrun
@@ -1,15 +1,77 @@
 #!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
+#
+# Script
+#     Allrun
+#
+# Description
+#     Run tutorial cases and summarize the outcome as 'testLoopReport'
+#
+#------------------------------------------------------------------------------
 cd ${0%/*} || exit 1    # Run from this directory
 
+usage()
+{
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+
+usage: ${0##*/} [OPTION]
+
+options:
+  -collect          Collect logs only. Can be useful for aborted runs.
+  -help             print the usage
+
+Run tutorial cases and summarize the outcome as 'testLoopReport'
+
+USAGE
+    exit 1
+}
+
 #------------------------------------------------------------------------------
+unset optCollectOnly
 
-for tutName in simpleslope entrainment
+# Parse options
+while [ "$#" -gt 0 ]
 do
-    echo
-    echo "running tutorial case $tutName"
-    echo
-    (cd $tutName && ./Allrun)
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -collect)
+        optCollectOnly=true
+        ;;
+    -test)   # Known options that should be passed through
+        break
+        ;;
+    -*)
+        usage "unknown option: $1"
+        ;;
+    *)
+        break
+        ;;
+    esac
+    shift
 done
 
 
+#------------------------------------------------------------------------------
+. $WM_PROJECT_DIR/bin/tools/LogFunctions    # Tutorial log-file functions
+
+if [ -z "$optCollectOnly" ]
+then
+    foamRunTutorials -skipFirst $*          # Run tutorials recursively
+fi
+
+collectLogs
+
 #------------------------------------------------------------------------------