Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 0fc91db1cac2084b1fb6e4b5d1e0fb31c7a12257)
+++ Jenkinsfile	(revision 597e39516ffabaca438ac850b11c1496c54c30e7)
@@ -150,20 +150,17 @@
 		sh 'ulimit -a'
 
-		Tools.BuildStage('Test: short', !Settings.RunAllTests) {
+		jopt = '-j $(nproc)'
+
+		Tools.BuildStage('Test: Debug') {
 			dir (BuildDir) {
 				//Run the tests from the tests directory
-				sh "make --no-print-directory -C tests archiveerrors=${BuildDir}/tests/crashes/short"
+				sh """make ${jopt} --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/full-debug"""
 			}
 		}
 
-		Tools.BuildStage('Test: full', Settings.RunAllTests) {
+		Tools.BuildStage('Test: Release', Settings.RunAllTests) {
 			dir (BuildDir) {
-					jopt = '-j $(nproc)'
-					if( Settings.Architecture.node == 'x86' ) {
-						jopt = '-j2'
-					}
-					//Run the tests from the tests directory
-					sh """make ${jopt} --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/full-debug"""
-					sh """make ${jopt} --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/full-nodebug"""
+				//Run the tests from the tests directory
+				sh """make ${jopt} --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/full-nodebug"""
 			}
 		}
@@ -384,5 +381,5 @@
 				],												\
 				[$class: 'BooleanParameterDefinition',  						\
-					description: 'If false, only the quick test suite is ran', 		\
+					description: 'If false, the test suite is only ran in debug', 	\
 					name: 'RunAllTests', 								\
 					defaultValue: false,  								\