diff --git a/bin/maint/mergexx b/bin/maint/mergexx
index baaf52bde99a0ea74455965f136ab8c2bdbae972..8a29512cc80db86ee172e2bf28191be86fc571f0 100755
--- a/bin/maint/mergexx
+++ b/bin/maint/mergexx
@@ -58,10 +58,16 @@ run_main()
     printf "\nopening '${upstream}' branch...\n"
     hg branch -f ${upstream} || _error "failed"
 
+    msg="[#23037] merge '${rev}' @ ${tag}."
+
     printf "\nmerging '${rev}'..."
-    hg merge --tool=internal:merge ${rev} || _error "failed"
+    hg merge --tool=internal:merge ${rev}
+    iret=${?}
+    if [ ${iret} -ne 0 ]; then
+        echo "${msg}" > .hg/last-message
+        _error "failed (commit message saved in '.hg/last-message')"
+    fi
 
-    msg="[#23037] merge '${rev}' @ ${tag}."
     printf "\ncommitting with message '${msg}'...\n"
     hg ci -m "${msg}" || _error "failed"
 
diff --git a/lib/aslint/test/list.not_rerun b/lib/aslint/test/list.not_rerun
index 0baace5342ca7ab151a7409e0d9c3de92ffa912e..ecd74a801b3955052eca494be38b8e4aba17f204 100644
--- a/lib/aslint/test/list.not_rerun
+++ b/lib/aslint/test/list.not_rerun
@@ -1,11 +1,6 @@
 # these testcases are not re-run even if the previous run failed (validate_revision)
 
 # currently fail
-comp002g
-comp003b
-comp003c
-forma11a
-mfron04e
 plexu01a
 plexu02a
 plexu02b
@@ -17,12 +12,3 @@ plexu08a
 plexu08d
 plexu08g
 plexu11b
-sdls121c
-sdnl112b
-ssnv504k
-zzzz100g
-zzzz186a
-zzzz412b
-zzzz413a
-zzzz413b
-zzzz413c
diff --git a/lib/hgaster/maintenance.py b/lib/hgaster/maintenance.py
index 2b4bea693f1bba2f328aac46abcefaef2c142034..617a5db52717e61bc43127b89b00d1370b521155 100644
--- a/lib/hgaster/maintenance.py
+++ b/lib/hgaster/maintenance.py
@@ -667,9 +667,9 @@ class UpdateInstallation(BaseMaintenance):
         logger.title(_("update devtools repository"))
         self._update_repo(tools)
         self.pull_update(drev)
-        self.make_aster_dict()
         self.set_waf_params()
         self.waf_command()
+        self.make_aster_dict()
         if self.opts.runtest:
             self.build_testlist()
             self.run_test(self.opts.resutest, drev['alias'])