diff --git a/tests/builtins/test_config b/tests/builtins/test_config
index 0264f96531357bbcf6c3f754e378dae60f5d84b8..1876e8435a965be10dd7cb1e18b22f613025b24b 100644
--- a/tests/builtins/test_config
+++ b/tests/builtins/test_config
@@ -1,4 +1 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
-PLUGIN: @EVA_PLUGINS@
-OPT: -eva @EVA_CONFIG@ -out -input -deps
diff --git a/tests/builtins/test_config_apron b/tests/builtins/test_config_apron
index 7129d40503e535b548167a45fe27f401f38ff67e..1876e8435a965be10dd7cb1e18b22f613025b24b 100644
--- a/tests/builtins/test_config_apron
+++ b/tests/builtins/test_config_apron
@@ -1,5 +1 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
-MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
-
-OPT: @EVA_TEST@
diff --git a/tests/builtins/test_config_bitwise b/tests/builtins/test_config_bitwise
index 7129d40503e535b548167a45fe27f401f38ff67e..1876e8435a965be10dd7cb1e18b22f613025b24b 100644
--- a/tests/builtins/test_config_bitwise
+++ b/tests/builtins/test_config_bitwise
@@ -1,5 +1 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
-MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
-
-OPT: @EVA_TEST@
diff --git a/tests/builtins/test_config_equality b/tests/builtins/test_config_equality
index 7129d40503e535b548167a45fe27f401f38ff67e..1876e8435a965be10dd7cb1e18b22f613025b24b 100644
--- a/tests/builtins/test_config_equality
+++ b/tests/builtins/test_config_equality
@@ -1,5 +1 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
-MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
-
-OPT: @EVA_TEST@
diff --git a/tests/builtins/test_config_gauges b/tests/builtins/test_config_gauges
index 7129d40503e535b548167a45fe27f401f38ff67e..1876e8435a965be10dd7cb1e18b22f613025b24b 100644
--- a/tests/builtins/test_config_gauges
+++ b/tests/builtins/test_config_gauges
@@ -1,5 +1 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
-MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
-
-OPT: @EVA_TEST@
diff --git a/tests/builtins/test_config_octagon b/tests/builtins/test_config_octagon
index 7129d40503e535b548167a45fe27f401f38ff67e..1876e8435a965be10dd7cb1e18b22f613025b24b 100644
--- a/tests/builtins/test_config_octagon
+++ b/tests/builtins/test_config_octagon
@@ -1,5 +1 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
-MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
-
-OPT: @EVA_TEST@
diff --git a/tests/builtins/test_config_symblocs b/tests/builtins/test_config_symblocs
index 7129d40503e535b548167a45fe27f401f38ff67e..1876e8435a965be10dd7cb1e18b22f613025b24b 100644
--- a/tests/builtins/test_config_symblocs
+++ b/tests/builtins/test_config_symblocs
@@ -1,5 +1 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
-MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
-
-OPT: @EVA_TEST@
diff --git a/tests/test_config b/tests/test_config
index 997a6c54b93356a25a034a6a18cc58a0b4769da0..fb474386300e9109653c99839364a33a783455eb 100644
--- a/tests/test_config
+++ b/tests/test_config
@@ -1,6 +1,5 @@
 MACRO: EVA_MAIN_PLUGINS eva,scope
 MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
-MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0
 MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
 MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
 
@@ -9,3 +8,6 @@ MACRO: RTE_TEST -rte -no-warn-invalid-pointer
 
 PLUGIN: @EVA_PLUGINS@
 OPT: @EVA_TEST@
+
+# Late declaration to allow redefinition of EVA_OPTIONS in subsidiary test_config files
+MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0
diff --git a/tests/test_config_apron b/tests/test_config_apron
index 3da27e2a2ef973e561bf30f4da5b776a334d68bb..32de05d7c0f20a999b8499e88ce3d40627a5b121 100644
--- a/tests/test_config_apron
+++ b/tests/test_config_apron
@@ -1,6 +1,5 @@
 MACRO: EVA_MAIN_PLUGINS eva,scope
 MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
-MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains apron-octagon -eva-warn-key experimental=inactive
 MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
 MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
 
@@ -11,3 +10,6 @@ FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
 
 PLUGIN: @EVA_PLUGINS@
 OPT: @EVA_TEST@
+
+# Late declaration to allow redefinition of EVA_OPTIONS in subsidiary test_config_xxx files
+MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains apron-octagon -eva-warn-key experimental=inactive
diff --git a/tests/test_config_bitwise b/tests/test_config_bitwise
index c234708a10793096e2773baa50cf00ba2696340c..1407e25287add669eb01538c3c86bd36b87341bd 100644
--- a/tests/test_config_bitwise
+++ b/tests/test_config_bitwise
@@ -1,6 +1,5 @@
 MACRO: EVA_MAIN_PLUGINS eva,scope
 MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
-MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains bitwise
 MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
 MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
 
@@ -11,3 +10,6 @@ FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
 
 PLUGIN: @EVA_PLUGINS@
 OPT: @EVA_TEST@
+
+# Late declaration to allow redefinition of EVA_OPTIONS in subsidiary test_config_xxx files
+MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains bitwise
diff --git a/tests/test_config_equality b/tests/test_config_equality
index b631fa9d65f22f66a0453dcd5a787f4f78255a64..58feee37a95057215515fc805ecdd7d5274b6c7a 100644
--- a/tests/test_config_equality
+++ b/tests/test_config_equality
@@ -1,6 +1,5 @@
 MACRO: EVA_MAIN_PLUGINS eva,scope
 MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
-MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains equality
 MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
 MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
 
@@ -11,3 +10,6 @@ FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
 
 PLUGIN: @EVA_PLUGINS@
 OPT: @EVA_TEST@
+
+# Late declaration to allow redefinition of EVA_OPTIONS in subsidiary test_config_xxx files
+MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains equality
diff --git a/tests/test_config_gauges b/tests/test_config_gauges
index 177f05dbccdf68c101fdc0a0d54c8e3a708c7705..ca7078ec30dbb54ea9d451edc8fdfcc4aab6516e 100644
--- a/tests/test_config_gauges
+++ b/tests/test_config_gauges
@@ -1,6 +1,5 @@
 MACRO: EVA_MAIN_PLUGINS eva,scope
 MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
-MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains gauges
 MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
 MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
 
@@ -11,3 +10,6 @@ FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
 
 PLUGIN: @EVA_PLUGINS@
 OPT: @EVA_TEST@
+
+# Late declaration to allow redefinition of EVA_OPTIONS in subsidiary test_config_xxx files
+MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains gauges
diff --git a/tests/test_config_octagon b/tests/test_config_octagon
index e72845bbe14aa428519172c4a1fdd9ee55a00af7..fe1773cc1ea9069cfaea369e8adf0a8c296add6a 100644
--- a/tests/test_config_octagon
+++ b/tests/test_config_octagon
@@ -1,6 +1,5 @@
 MACRO: EVA_MAIN_PLUGINS eva,scope
 MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
-MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-domains octagon
 MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
 MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
 
@@ -11,3 +10,6 @@ FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
 
 PLUGIN: @EVA_PLUGINS@
 OPT: @EVA_TEST@
+
+# Late declaration to allow redefinition of EVA_OPTIONS in subsidiary test_config_xxx files
+MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-domains octagon
diff --git a/tests/test_config_symblocs b/tests/test_config_symblocs
index 6910404f9a855d0e334e60a4f6cbbb83534a6a75..2352a39dc19574907fd9181d0c181ca94a5a7133 100644
--- a/tests/test_config_symblocs
+++ b/tests/test_config_symblocs
@@ -1,6 +1,5 @@
 MACRO: EVA_MAIN_PLUGINS eva,scope
 MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
-MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains symbolic-locations
 MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
 MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
 
@@ -11,3 +10,6 @@ FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
 
 PLUGIN: @EVA_PLUGINS@
 OPT: @EVA_TEST@
+
+# Late declaration to allow redefinition of EVA_OPTIONS in subsidiary test_config_xxx files
+MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains symbolic-locations