diff --git a/share/analysis-scripts/analysis.mk b/share/analysis-scripts/analysis.mk
index 1d5d87e03b5944c0570ba1c1e686204c1d91bb44..a5a5c94a4a32946b6f2c0cfd9b17278b75d07a79 100644
--- a/share/analysis-scripts/analysis.mk
+++ b/share/analysis-scripts/analysis.mk
@@ -163,8 +163,8 @@ SHELL        := $(shell which bash)
 %.parse: SOURCES = $(filter-out %/command,$^)
 %.parse: PARSE = $(FRAMAC) \
                  $(if $(AST_DIFF),\
-                   $(if $(wildcard $@/framac.sav),\
-                    -load $@/framac.reparse -then -ast-diff,),) \
+                   $(if $(wildcard $@/framac.sav $*.eva/framac.sav),\
+                    -load $@/framac.reparse -then -no-eva -ast-diff,),) \
                  $(FCFLAGS) \
                  $(if $(value MACHDEP),-machdep $(MACHDEP),) \
                  -cpp-extra-args="$(CPPFLAGS)" $(SOURCES) \
@@ -173,8 +173,11 @@ SHELL        := $(shell which bash)
 	@$(call display_command,$(PARSE))
 	mkdir -p $@
 	$(if $(AST_DIFF),\
-          $(if $(wildcard $@/framac.sav),mv $@/framac.sav $@/framac.reparse,true)\
-          ,true)
+	  $(if $(wildcard $*.eva/framac.sav), \
+               mv $*.eva/framac.sav $@/framac.reparse,\
+               $(if $(wildcard $@/framac.sav), \
+                    mv $@/framac.sav $@/framac.reparse,true)),\
+          true)
 	mv -f $@/{command,running}
 	{
 	  $(call time_with_output,$@/stats.txt) \