diff --git a/Makefile b/Makefile
index 1e476c208e..2e07011703 100644
--- a/Makefile
+++ b/Makefile
@@ -319,8 +319,8 @@ test_examples: all
 
 test_all_confs: all
 	$(Q)$(eval $CONFS:=$(shell ./find_confs.py))
-	@echo "Found $(words $($CONFS)) config files: $($CONFS)"
-	$(Q)$(foreach conf,$($CONFS),echo "Testing all aircrafts in conf: $(conf)" && CONF_XML=$(conf) prove tests/examples/ ;)
+	@echo "************\nFound $(words $($CONFS)) config files: $($CONFS)"
+	$(Q)$(foreach conf,$($CONFS),echo "\n************\nTesting all aircrafts in conf: $(conf)\n************" && (CONF_XML=$(conf) prove tests/examples/ || echo "failed $(conf)" >> TEST_ALL_CONFS_FAILED);) test -f TEST_ALL_CONFS_FAILED && cat TEST_ALL_CONFS_FAILED && rm -f TEST_ALL_CONFS_FAILED && exit 1
 
 # run some math tests that don't need whole paparazzi to be built
 test_math:
diff --git a/find_confs.py b/find_confs.py
index 28dd787a46..9505998374 100755
--- a/find_confs.py
+++ b/find_confs.py
@@ -9,7 +9,7 @@ def find_conf_files(pprz_home, conf_dir, exclude_backups=True):
     conf_files = []
     pattern = "*conf[._-]*xml"
     backup_pattern = "*conf[._-]*xml.20[0-9][0-9]-[01][0-9]-[0-3][0-9]_*"
-    excludes = ["%gconf.xml"]
+    excludes = ["conf/%gconf.xml", "conf/conf.xml"]
 
     for path, subdirs, files in os.walk(conf_dir):
         for name in files:
@@ -18,7 +18,7 @@ def find_conf_files(pprz_home, conf_dir, exclude_backups=True):
             if fnmatch(name, pattern):
                 filepath = os.path.join(path, name)
                 entry = os.path.relpath(filepath, pprz_home)
-                if not os.path.islink(filepath) and name not in excludes:
+                if not os.path.islink(filepath) and entry not in excludes:
                     conf_files.append(entry)
     return conf_files