diff --git a/testing/testing_zcheck_facto.c b/testing/testing_zcheck_facto.c
index c09a699345c56b4f84e7597f8fdfd186556a00a4..a9ad49b3ab0e92aa277404ec94699ac984d7fede 100644
--- a/testing/testing_zcheck_facto.c
+++ b/testing/testing_zcheck_facto.c
@@ -427,7 +427,7 @@ int check_zsolve( run_arg_list_t *args, cham_mtxtype_t matrix_type, cham_trans_t
     }
 
     Rnorm = CHAMELEON_zlange_Tile( ChamOneNorm, descB );
-    result = Rnorm / ( Anorm * Xnorm * chameleon_max( M, N ) * eps );
+    result = Rnorm / ( Anorm * Xnorm * max( M, N ) * eps );
 
     run_arg_add_double( args, "||A||", Anorm );
     run_arg_add_double( args, "||X||", Xnorm );
diff --git a/testing/testing_zcheck_polar_decomp.c b/testing/testing_zcheck_polar_decomp.c
index 761f592972188dd37ec0cd290ab7248f619ad175..b8469b232136314c03806227e848a961c096526b 100644
--- a/testing/testing_zcheck_polar_decomp.c
+++ b/testing/testing_zcheck_polar_decomp.c
@@ -36,10 +36,6 @@
 #include "testing_zcheck.h"
 #include <chameleon/flops.h>
 
-#ifndef max
-#define max( _a_, _b_ ) ( (_a_) > (_b_) ? (_a_) : (_b_) )
-#endif
-
 /**
  ********************************************************************************
  *
diff --git a/testing/testing_zcheck_qr_lq.c b/testing/testing_zcheck_qr_lq.c
index 247adba1a0a68cb80b140b4b418e818eb33dce59..9676a3c4921c94ead85657bf430c6e528ec85fb6 100644
--- a/testing/testing_zcheck_qr_lq.c
+++ b/testing/testing_zcheck_qr_lq.c
@@ -36,10 +36,6 @@
 #include "testing_zcheck.h"
 #include <chameleon/flops.h>
 
-#ifndef max
-#define max( _a_, _b_ ) ( (_a_) > (_b_) ? (_a_) : (_b_) )
-#endif
-
 /**
  ********************************************************************************
  *
diff --git a/testing/testing_zcheck_svd.c b/testing/testing_zcheck_svd.c
index 6df281921fabc0c7209a5b35a96d2be09425cee8..84c53b9bc4e48ba0e2b4d101c00c0b36d3b565ec 100644
--- a/testing/testing_zcheck_svd.c
+++ b/testing/testing_zcheck_svd.c
@@ -32,10 +32,6 @@
 #include "testing_zcheck.h"
 #include <chameleon/flops.h>
 
-#ifndef max
-#define max( _a_, _b_ ) ( (_a_) > (_b_) ? (_a_) : (_b_) )
-#endif
-
 /**
  ********************************************************************************
  *