diff --git a/tests/test-mbuffer.c b/tests/test-mbuffer.c
index 159c3130..3c5d76af 100644
--- a/tests/test-mbuffer.c
+++ b/tests/test-mbuffer.c
@@ -39,8 +39,8 @@ BUFFER_DEF(buffer_char, char, 10, BUFFER_STACK|BUFFER_UNBLOCKING)
 // Define a fixed queue of long long
 BUFFER_DEF(buffer_llong, long long, 16, BUFFER_QUEUE|BUFFER_THREAD_UNSAFE|BUFFER_UNBLOCKING)
 
-#include <gmp.h>
-BUFFER_DEF(buffer_mpz, mpz_t, 32, BUFFER_QUEUE, (INIT(mpz_init), INIT_SET(mpz_init_set), SET(mpz_set), CLEAR(mpz_clear)))
+#include "mympz.h"
+BUFFER_DEF(buffer_mpz, my_mpz_t, 32, BUFFER_QUEUE, MY_MPZ_OPLIST)
 
 buffer_uint_t g_buff;
 
diff --git a/tests/test-mrbtree.c b/tests/test-mrbtree.c
index 2ecd7d22..84b00364 100644
--- a/tests/test-mrbtree.c
+++ b/tests/test-mrbtree.c
@@ -21,7 +21,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <stdio.h>
-#include <gmp.h> // For testing purpose only.
+#include "mympz.h"
 #include "m-string.h"
 #include "m-rbtree.h"
 
@@ -46,6 +46,7 @@ RBTREE_DEF(rbtree_uint, unsigned int, M_OPEXTEND(M_DEFAULT_OPLIST, IN_STR(uint_i
 END_COVERAGE
 
 RBTREE_DEF(rbtree_float, float)
+RBTREE_DEF(rbtree_mpz, my_mpz_t, MY_MPZ_OPLIST)
 
 #define UINT_OPLIST RBTREE_OPLIST(rbtree_uint)
 #define FLOAT_OP RBTREE_OPLIST(rbtree_float)
diff --git a/tests/test-msnapshot.c b/tests/test-msnapshot.c
index c0f46a6c..94a21c4c 100644
--- a/tests/test-msnapshot.c
+++ b/tests/test-msnapshot.c
@@ -20,7 +20,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include <gmp.h> // For testing purpose only.
+#include "mympz.h"
 
 #include "m-snapshot.h"
 #include "m-mutex.h"
@@ -47,8 +47,7 @@ static void data_set(data_t *p, data_t o) { p->n = o.n; data_crc(p); }
 
 START_COVERAGE
 SNAPSHOT_SPSC_DEF(snapshot_uint, unsigned int)
-SNAPSHOT_SPSC_DEF(snapshot_mpz, mpz_t,
-                  (INIT(mpz_init), INIT_SET(mpz_init_set), SET(mpz_set), CLEAR(mpz_clear)))
+SNAPSHOT_SPSC_DEF(snapshot_mpz, my_mpz_t, MY_MPZ_OPLIST)
 SNAPSHOT_SPMC_DEF(snapshot_mrsw_data, data_t, DATA_OPLIST)
 SNAPSHOT_MPMC_DEF(snapshot_mrmw_data, data_t, DATA_OPLIST)
 END_COVERAGE