diff --git a/tests/builtins/test_config_bitwise b/tests/builtins/test_config_bitwise
index 365fdc8d48cbda0c83335a388b0cf9b0d7ceb848..7129d40503e535b548167a45fe27f401f38ff67e 100644
--- a/tests/builtins/test_config_bitwise
+++ b/tests/builtins/test_config_bitwise
@@ -1,3 +1,5 @@
 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@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
+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 365fdc8d48cbda0c83335a388b0cf9b0d7ceb848..7129d40503e535b548167a45fe27f401f38ff67e 100644
--- a/tests/builtins/test_config_equality
+++ b/tests/builtins/test_config_equality
@@ -1,3 +1,5 @@
 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@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
+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 365fdc8d48cbda0c83335a388b0cf9b0d7ceb848..7129d40503e535b548167a45fe27f401f38ff67e 100644
--- a/tests/builtins/test_config_gauges
+++ b/tests/builtins/test_config_gauges
@@ -1,3 +1,5 @@
 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@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
+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 365fdc8d48cbda0c83335a388b0cf9b0d7ceb848..7129d40503e535b548167a45fe27f401f38ff67e 100644
--- a/tests/builtins/test_config_octagon
+++ b/tests/builtins/test_config_octagon
@@ -1,3 +1,5 @@
 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@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
+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 365fdc8d48cbda0c83335a388b0cf9b0d7ceb848..7129d40503e535b548167a45fe27f401f38ff67e 100644
--- a/tests/builtins/test_config_symblocs
+++ b/tests/builtins/test_config_symblocs
@@ -1,3 +1,5 @@
 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@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
+MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+OPT: @EVA_TEST@