Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 13a984c6e9ba80e71a8c43f02a81da9e4c332f1e)
+++ Jenkinsfile	(revision b90aace6d1004b46dd2f6937e4aa9b811e7fdd60)
@@ -128,9 +128,9 @@
 			//Run the tests from the tests directory
 			if ( Settings.RunAllTests ) {
-				sh 'make --no-print-directory -C tests all-tests debug=yes'
-				sh 'make --no-print-directory -C tests all-tests debug=no '
+				sh 'make --no-print-directory -C tests timeouts="--timeout=600" all-tests debug=yes'
+				sh 'make --no-print-directory -C tests timeouts="--timeout=600" all-tests debug=no '
 			}
 			else {
-				sh 'make --no-print-directory -C tests'
+				sh 'make --no-print-directory -C tests timeouts="--timeout=600"'
 			}
 		}
Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 13a984c6e9ba80e71a8c43f02a81da9e4c332f1e)
+++ tests/Makefile.am	(revision b90aace6d1004b46dd2f6937e4aa9b811e7fdd60)
@@ -23,4 +23,5 @@
 
 concurrent=
+timeouts=
 
 TEST_PY = python ${builddir}/test.py
@@ -50,8 +51,8 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-	@+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
+	@+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} ${quick_test}
 
 all-tests :
-	@+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}		# '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+	@+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :