diff --git a/tests/mympz.h b/tests/mympz.h
index e449eb1f..5d667389 100644
--- a/tests/mympz.h
+++ b/tests/mympz.h
@@ -3,7 +3,7 @@
 
 #include "m-string.h"
 
-/* This is a trivial encapsulation of an opquae structure.
+/* This is a trivial encapsulation of an opaque structure.
    Used for test purpose only.*/
 typedef struct my_mpz_s {
   unsigned int n;
@@ -97,7 +97,7 @@ static void my_mpz_str(string_t str, const my_mpz_t z, bool append)
   else        string_printf (str, "%u", z->ptr[0]);
 }
 
-#define MYMPZ_OPLIST                                                    \
+#define MY_MPZ_OPLIST                                                    \
   (INIT(my_mpz_init), INIT_SET(my_mpz_init_set), SET(my_mpz_set), CLEAR(my_mpz_clear), \
    OUT_STR(my_mpz_out_str), IN_STR(my_mpz_in_str), EQUAL(my_mpz_equal_p), \
    GET_STR(my_mpz_str) )
diff --git a/tests/test-marray.c b/tests/test-marray.c
index 4b654782..221a36a9 100644
--- a/tests/test-marray.c
+++ b/tests/test-marray.c
@@ -27,7 +27,7 @@
 
 START_COVERAGE
 ARRAY_DEF(array_uint, unsigned int)
-ARRAY_DEF(array_mpz, my_mpz_t, MYMPZ_OPLIST)
+ARRAY_DEF(array_mpz, my_mpz_t, MY_MPZ_OPLIST)
 END_COVERAGE
 #define ARRAY_UINT_OPLIST ARRAY_OPLIST(array_uint)
 
diff --git a/tests/test-mdeque.c b/tests/test-mdeque.c
index 75fee147..3efe80cc 100644
--- a/tests/test-mdeque.c
+++ b/tests/test-mdeque.c
@@ -31,7 +31,7 @@
 START_COVERAGE
 DEQUE_DEF(deque, int)
 END_COVERAGE
-DEQUE_DEF(deque_mpz, my_mpz_t, MYMPZ_OPLIST)
+DEQUE_DEF(deque_mpz, my_mpz_t, MY_MPZ_OPLIST)
 
 #define OPL DEQUE_OPLIST(deque)
 
diff --git a/tests/test-mlist.c b/tests/test-mlist.c
index e9da8ef9..0683849c 100644
--- a/tests/test-mlist.c
+++ b/tests/test-mlist.c
@@ -28,10 +28,10 @@
 #include "coverage.h"
 START_COVERAGE
 LIST_DEF(list_uint, unsigned int)
-LIST_DEF(list_mpz, my_mpz_t, MYMPZ_OPLIST)
+LIST_DEF(list_mpz, my_mpz_t, MY_MPZ_OPLIST)
 LIST_DUAL_PUSH_DEF(list2_double, double) 
 END_COVERAGE
-LIST_DUAL_PUSH_DEF(list2_mpz, my_mpz_t, MYMPZ_OPLIST)
+LIST_DUAL_PUSH_DEF(list2_mpz, my_mpz_t, MY_MPZ_OPLIST)
 #define LIST_UINT_OPLIST LIST_OPLIST(list_uint)
 
 static void test_uint(void)
diff --git a/tests/test-mtuple.c b/tests/test-mtuple.c
index 50b21213..949dd10d 100644
--- a/tests/test-mtuple.c
+++ b/tests/test-mtuple.c
@@ -30,19 +30,19 @@
 START_COVERAGE
 TUPLE_DEF2(pair,
            (key, string_t, (INIT(string_init), INIT_SET(string_init_set), SET(string_set), CLEAR(string_clear))),
-           (value, my_mpz_t, MYMPZ_OPLIST) )
+           (value, my_mpz_t, MY_MPZ_OPLIST) )
 END_COVERAGE
 
 // No cmp defined
 TUPLE_DEF2(triple,
            (key, string_t, (INIT(string_init), INIT_SET(string_init_set), SET(string_set), CLEAR(string_clear), CMP(string_cmp))),
-           (value, my_mpz_t, MYMPZ_OPLIST ),
+           (value, my_mpz_t, MY_MPZ_OPLIST ),
            (data, const char *, ()))
 
 // cmp shall be defined
 TUPLE_DEF2(pair3,
            (key, string_t, (INIT(string_init), INIT_SET(string_init_set), SET(string_set), CLEAR(string_clear), CMP(string_cmp), HASH(string_hash), EQUAL(string_equal_p))),
-           (value, my_mpz_t, M_OPEXTEND( MYMPZ_OPLIST, CMP(my_mpz_cmp)) ) )
+           (value, my_mpz_t, M_OPEXTEND( MY_MPZ_OPLIST, CMP(my_mpz_cmp)) ) )
 
 TUPLE_DEF2(pair_str,
            (vala, string_t, STRING_OPLIST),