diff --git a/Makefile b/Makefile
index b04ace6307..3f61fc2809 100644
--- a/Makefile
+++ b/Makefile
@@ -259,15 +259,15 @@ dist_clean_irreversible: clean
 ab_clean:
 	find sw/airborne -name '*~' -exec rm -f {} \;
 
-test_all_example_airframes:
-	$(MAKE) AIRCRAFT=BOOZ2_A1 clean_ac ap sim
-	$(MAKE) AIRCRAFT=Microjet clean_ac ap sim
-	$(MAKE) AIRCRAFT=Tiny_IMU clean_ac ap
-	$(MAKE) AIRCRAFT=EasyStar_ETS clean_ac ap sim
+test_all_example_airframes2: test_all_example_airframes
 
-test_all_example_airframes2:
+test_all_example_airframes: replace_current_conf_xml
 	for ap in `grep name conf/conf.xml.example | sed -e 's/.*name=\"//' | sed -e 's/"//'`; do echo "Making $$ap"; make -C ./ AIRCRAFT=$$ap clean_ac ap.compile || exit 1;   done
 
+replace_current_conf_xml:
+	mv conf/conf.xml conf/conf.xml.backup.`date +%Y%m%d-%H%M%s`
+	cp conf/conf.xml.example conf/conf.xml
+
 commands: paparazzi sw/simulator/launchsitl
 
 paparazzi: