diff --git a/tests/Makefile b/tests/Makefile
index a06af1922a..37c10dca34 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,6 +1,7 @@
 Q = @
 PERL = /usr/bin/perl
 TEST_VERBOSE = 0
+TEST_JOBS ?= 1
 NON_TEST_DIRS = lib|results
 HARDWARE_REGEX = Lisa|Tiny|Umarim
 HARDWARE_TEST_DIRS = $(shell find -L * -maxdepth 1 -type d | grep -Ev "$(NON_TEST_DIRS)" | grep -E "$(HARDWARE_REGEX)")
@@ -14,14 +15,14 @@ else
 	TEST_DIRECTORIES = $(NON_HARDWARE_TEST_DIRS) $(HARDWARE_TEST_DIRS)
 endif
 endif
-TEST_FILES := $(shell ls $(TEST_DIRECTORIES:%=%/*.t))
+TEST_FILES ?= $(shell ls $(TEST_DIRECTORIES:%=%/*.t))
 
 ifneq ($(JUNIT),)
 	PERLENV=PERL_TEST_HARNESS_DUMP_TAP=$(PAPARAZZI_SRC)/tests/results
 	RUNTESTS=use TAP::Harness; TAP::Harness->new({ formatter_class => 'TAP::Formatter::JUnit', verbosity => $(TEST_VERBOSE), merge => 1, } )->runtests(qw($(TEST_FILES)))
 else
 	PERLENV=
-	RUNTESTS=use TAP::Harness;TAP::Harness->new( { verbosity => $(TEST_VERBOSE) } )->runtests(qw($(TEST_FILES)))
+	RUNTESTS=use TAP::Harness; exit TAP::Harness->new( { verbosity => $(TEST_VERBOSE), jobs => $(TEST_JOBS) } )->runtests(qw($(TEST_FILES)))->failed
 endif
 
 test:
diff --git a/tests/examples/01_compile_all_test_targets.t b/tests/examples/01_compile_all_test_targets.t
index 7cc99e964a..6b16bac344 100644
--- a/tests/examples/01_compile_all_test_targets.t
+++ b/tests/examples/01_compile_all_test_targets.t
@@ -8,7 +8,7 @@ use Data::Dumper;
 use Config;
 
 $|++;
-my $examples = XMLin("$ENV{'PAPARAZZI_SRC'}/conf/conf_tests.xml");
+my $examples = XMLin("$ENV{'PAPARAZZI_SRC'}/conf/conf.xml");
 my $xmlSimple = XML::Simple->new(ForceArray => 1);
 
 use Data::Dumper;