diff --git a/tests/constant_propagation/array_pointers.i b/tests/constant_propagation/array_pointers.i
index bd9fff2b4206d45747788c218ec69966d089ffea..5f2d17c28f129708156e261807464f616cacdecc 100644
--- a/tests/constant_propagation/array_pointers.i
+++ b/tests/constant_propagation/array_pointers.i
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -eva -eva-show-progress -scf -eva-show-progress -journal-disable
+   STDOPT: +"-eva"
 */
 
 void *p;
diff --git a/tests/constant_propagation/bts-1787-bis.i b/tests/constant_propagation/bts-1787-bis.i
index 01be6cb5fcfae8827b87b2f0160aa6205edc752a..cd70cec18f7a82dee41709f2bb73044d8ee44d09 100644
--- a/tests/constant_propagation/bts-1787-bis.i
+++ b/tests/constant_propagation/bts-1787-bis.i
@@ -1,7 +1,7 @@
 /* run.config
-OPT: -journal-disable -print
-OPT: -journal-disable -scf -eva-show-progress
-OPT: -journal-disable -scf -eva-show-progress -scf-allow-cast
+   OPT: -print -journal-disable
+   STDOPT:
+   STDOPT: +"-scf-allow-cast"
 */
 
 typedef struct {
diff --git a/tests/constant_propagation/bts-1787.i b/tests/constant_propagation/bts-1787.i
index a959b09e871642616cb4360f50404efb5f207821..6b534ca4bbdf3057ce5a0049bf682f69faff46eb 100644
--- a/tests/constant_propagation/bts-1787.i
+++ b/tests/constant_propagation/bts-1787.i
@@ -1,6 +1,6 @@
 /* run.config
-OPT: -journal-disable -scf -eva-show-progress -scf-allow-cast
-OPT: -journal-disable -scf -eva-show-progress
+   STDOPT: +"-scf-allow-cast"
+   STDOPT:
 */
 
 typedef struct {
diff --git a/tests/constant_propagation/const_field_return_struct.i b/tests/constant_propagation/const_field_return_struct.i
index 9bf7ea6975b7a8a6c0e43519e2b6f6643473e833..6b4473198a227ba1a1c6ca5835d2706c1441d847 100644
--- a/tests/constant_propagation/const_field_return_struct.i
+++ b/tests/constant_propagation/const_field_return_struct.i
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -eva -eva-show-progress -scf -eva-show-progress -journal-disable
+   STDOPT: +"-eva"
 */
 
 struct S {
diff --git a/tests/constant_propagation/enum.i b/tests/constant_propagation/enum.i
index c36692b4ed8bf4db1691d62a71f7994022dd83ed..374f0d5ffb613779f697b36708e4de93ce541370 100644
--- a/tests/constant_propagation/enum.i
+++ b/tests/constant_propagation/enum.i
@@ -1,5 +1,5 @@
 /* run.config
-OPT: -semantic-const-folding -eva-show-progress
+   STDOPT:
 */
 
 enum E { A, B, C, D };
diff --git a/tests/constant_propagation/fct_ptr.i b/tests/constant_propagation/fct_ptr.i
index 12a34d58d3c1ffbd68b23d3098ecacac627fcf85..9182142aa59a1b93d0a5fdd6a0e68037b43e6cb1 100644
--- a/tests/constant_propagation/fct_ptr.i
+++ b/tests/constant_propagation/fct_ptr.i
@@ -1,5 +1,5 @@
 /* run.config
-OPT: -scf -eva-show-progress -then-on propagated
+   STDOPT: +"-then-on propagated"
 */
 
 void (*pf)(void);
diff --git a/tests/constant_propagation/struct_field.i b/tests/constant_propagation/struct_field.i
index 9621fff8f016094812dbc66f87fda23243676709..97e18ced9849b044b3f42186a7082b89a9d1aacd 100644
--- a/tests/constant_propagation/struct_field.i
+++ b/tests/constant_propagation/struct_field.i
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -eva -semantic-const-folding -eva-show-progress -journal-disable
+   STDOPT: +"-eva"
 */
 
 struct st {
diff --git a/tests/constant_propagation/test_config b/tests/constant_propagation/test_config
new file mode 100644
index 0000000000000000000000000000000000000000..b174b4500a1e5b4372bf921c6966f5355688c4b3
--- /dev/null
+++ b/tests/constant_propagation/test_config
@@ -0,0 +1 @@
+OPT: -journal-disable -scf -eva-show-progress