Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 8ecb5905164f38056d37409e6df651664e57e783)
+++ Jenkinsfile	(revision ab8315fb87406d5c04aea4101543ea9db10f4084)
@@ -128,15 +128,16 @@
 
 def test() {
-	build_stage('Test', true) {
-
+	build_stage('Test: short', !Settings.RunAllTests) {
 		dir (BuildDir) {
 			//Run the tests from the tests directory
-			if ( Settings.RunAllTests ) {
-				sh 'make --no-print-directory -C tests timeouts="--timeout=1200" all-tests debug=yes'
-				sh 'make --no-print-directory -C tests timeouts="--timeout=1200" all-tests debug=no '
-			}
-			else {
-				sh 'make --no-print-directory -C tests'
-			}
+			sh 'make --no-print-directory -C tests'
+		}
+	}
+
+	build_stage('Test: full', Settings.RunAllTests)
+		dir (BuildDir) {
+			//Run the tests from the tests directory
+			sh 'make --no-print-directory -C tests timeouts="--timeout=1200" all-tests debug=yes'
+			sh 'make --no-print-directory -C tests timeouts="--timeout=1200" all-tests debug=no '
 		}
 	}