Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 3e93c0088aec48e200e90a94575f4ae2efc29ed1)
+++ Jenkinsfile	(revision 4c1b9ea8543ea6634e95aee694f98a3779ac9126)
@@ -155,24 +155,24 @@
 
 def test() {
-	build_stage('Test: short', !Settings.RunAllTests) {
-		dir (BuildDir) {
-			//Run the tests from the tests directory
-			sh 'make --no-print-directory -C tests'
-		}
-	}
-
-	build_stage('Test: full', Settings.RunAllTests) {
-		dir (BuildDir) {
-			try {
+	try {
+		build_stage('Test: short', !Settings.RunAllTests) {
+			dir (BuildDir) {
 				//Run the tests from the tests directory
-				sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/debug"""
-				sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/nodebug"""
+				sh 'make --no-print-directory -C tests'
 			}
-			catch (Exception err) {
-				echo "Archiving core dumps"
-				archiveArtifacts artifacts: "${BuildDir}/tests/crashes", fingerprint: true
-				throw err
+		}
+
+		build_stage('Test: full', Settings.RunAllTests) {
+			dir (BuildDir) {
+					//Run the tests from the tests directory
+					sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/debug"""
+					sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/nodebug"""
 			}
 		}
+	}
+	catch (Exception err) {
+		echo "Archiving core dumps"
+		archiveArtifacts artifacts: "${BuildDir}/tests/crashes", fingerprint: true
+		throw err
 	}
 }