diff --git a/scripts/functional-tests/data-types/all_data_type_test.suite b/scripts/functional-tests/data-types/all_data_type_test.suite
new file mode 100644
index 000000000..949df111f
--- /dev/null
+++ b/scripts/functional-tests/data-types/all_data_type_test.suite
@@ -0,0 +1,7 @@
+progress_test.sah http://localhost:8080/navalplanner-webapp/
+criteria_test.sah http://localhost:8080/navalplanner-webapp/
+unit_measures_test.sah http://localhost:8080/navalplanner-webapp/
+label_test.sah http://localhost:8080/navalplanner-webapp/
+work_report_model.sah http://localhost:8080/navalplanner-webapp/
+exception_days_test.sah http://localhost:8080/navalplanner-webapp/
+work_hours_test.sah http://localhost:8080/navalplanner-webapp/
diff --git a/scripts/functional-tests/testrunner.sh b/scripts/functional-tests/testrunner.sh
index 5072a02d6..2b98533d1 100755
--- a/scripts/functional-tests/testrunner.sh
+++ b/scripts/functional-tests/testrunner.sh
@@ -4,8 +4,8 @@ then
 echo "Usage: testrunner.sh <sah file|suite file> <startURL> <browserType>"
 echo "File path is relative to <libreplan root folder>/scripts/functional-tests"
 echo "Example:"
-echo "testrunner.sh data-types/all_tests.suite http://localhost:8080/navalplanner-webapp <browserType>"
-echo "testrunner.sh data-types/progress_test.sah http://localhost:8080/navalplanner-webapp <browserType>"
+echo "./testrunner.sh data-types/all_data_type_test.suite http://localhost:8080/navalplanner-webapp <browserType>"
+echo "./testrunner.sh data-types/progress_test.sah http://localhost:8080/navalplanner-webapp <browserType>"
 else
 
 . ./sahi-common-env.sh
@@ -14,7 +14,7 @@ export USERDATA_DIR=$SAHI_HOME/userdata/
 export SCRIPTS_PATH=`pwd`/$1
 export BROWSER=$3
 export START_URL=$2
-export THREADS=2
+export THREADS=1
 export SINGLE_SESSION=false
 java -cp $SAHI_HOME/lib/ant-sahi.jar net.sf.sahi.test.TestRunner -test $SCRIPTS_PATH -browserType "$BROWSER" -baseURL $START_URL -host localhost -port 9999 -threads $THREADS -useSingleSession $SINGLE_SESSION
 fi