diff --git a/compute/pzgepdf_qdwh.c b/compute/pzgepdf_qdwh.c
index 2f640e7a798bae6232d18bee57e035134ac81524..de7a82cb1a1f8e99c79bbea4a3551e8c5549d835 100644
--- a/compute/pzgepdf_qdwh.c
+++ b/compute/pzgepdf_qdwh.c
@@ -604,15 +604,7 @@ chameleon_pzgepdf_qdwh( cham_mtxtype_t mtxtype, CHAM_desc_t *descU, CHAM_desc_t
     double normest, Unorm;
     int it, itconv, facto = -1;
 
-#if !defined(CHAMELEON_SIMULATION)
-    double eps  = LAPACKE_dlamch_work('e');
-#else
-#if defined(PRECISION_z) || defined(PRECISION_d)
-    double eps  = 1.e-15;
-#else
-    double eps  = 1.e-7;
-#endif
-#endif
+    double eps  = CHAMELEON_dlamch();
     double tol1 = 5. * eps;
     double tol3 = pow( tol1, 1./3. );
     double id_flops_ratio = ( _zgepdf_qdwh_opt_id == 1 ) ? .5 : 1.5;
diff --git a/example/lapack_to_chameleon/step0.h b/example/lapack_to_chameleon/step0.h
index 60c98fc18c20ac9c32d7186660f194f73dc24439..1f940475fcae8b141e0da8c90a8b581b69a08c55 100644
--- a/example/lapack_to_chameleon/step0.h
+++ b/example/lapack_to_chameleon/step0.h
@@ -96,11 +96,7 @@ static void read_args(int argc, char *argv[], int *iparam){
  * Print a header message to summarize main parameters
  */
 static void print_header(char *prog_name, int * iparam) {
-#if defined(CHAMELEON_SIMULATION)
-    double    eps = 0.;
-#else
-    double    eps = LAPACKE_dlamch_work( 'e' );
-#endif
+    double eps = LAPACKE_dlamch_work( 'e' );
 
     printf( "#\n"
             "# CHAMELEON %s\n"
diff --git a/example/lapack_to_chameleon/step1.h b/example/lapack_to_chameleon/step1.h
index abec8c3ea598dbb972d398cdcc6f9e668063a7e1..d3bc0724abeea5322e93a84b77ea95c3c57d2029 100644
--- a/example/lapack_to_chameleon/step1.h
+++ b/example/lapack_to_chameleon/step1.h
@@ -88,11 +88,7 @@ static void read_args(int argc, char *argv[], int *iparam){
  * Print a header message to summarize main parameters
  */
 static void print_header(char *prog_name, int * iparam) {
-#if defined(CHAMELEON_SIMULATION)
-    double    eps = 0.;
-#else
-    double    eps = LAPACKE_dlamch_work( 'e' );
-#endif
+    double eps = LAPACKE_dlamch_work( 'e' );
 
     printf( "#\n"
             "# CHAMELEON %d.%d.%d, %s\n"
diff --git a/example/lapack_to_chameleon/step2.h b/example/lapack_to_chameleon/step2.h
index 470466c287f018a6a8e9c70318ec8b6ba53eeb19..1c43fc94446886240e588e72b82334ee76e65ada 100644
--- a/example/lapack_to_chameleon/step2.h
+++ b/example/lapack_to_chameleon/step2.h
@@ -88,11 +88,7 @@ static void read_args(int argc, char *argv[], int *iparam){
  * Print a header message to summarize main parameters
  */
 static void print_header(char *prog_name, int * iparam) {
-#if defined(CHAMELEON_SIMULATION)
-    double    eps = 0.;
-#else
-    double    eps = LAPACKE_dlamch_work( 'e' );
-#endif
+    double eps = LAPACKE_dlamch_work( 'e' );
 
     printf( "#\n"
             "# CHAMELEON %d.%d.%d, %s\n"
diff --git a/example/lapack_to_chameleon/step3.h b/example/lapack_to_chameleon/step3.h
index 63c1ff0f47806e36477223c6eaf593877a6072bf..cbeeccaad4bff639ef8c266789fc28dec17dcfb4 100644
--- a/example/lapack_to_chameleon/step3.h
+++ b/example/lapack_to_chameleon/step3.h
@@ -88,11 +88,7 @@ static void read_args(int argc, char *argv[], int *iparam){
  * Print a header message to summarize main parameters
  */
 static void print_header(char *prog_name, int * iparam) {
-#if defined(CHAMELEON_SIMULATION)
-    double    eps = 0.;
-#else
-    double    eps = LAPACKE_dlamch_work( 'e' );
-#endif
+    double eps = LAPACKE_dlamch_work( 'e' );
 
     printf( "#\n"
             "# CHAMELEON %d.%d.%d, %s\n"
diff --git a/example/lapack_to_chameleon/step4.h b/example/lapack_to_chameleon/step4.h
index 28f0c4ca3ce3960fc901f38cd199bfc602f5d04d..d5b1a1c255d73b712f56e5e6af001e9424e2bac2 100644
--- a/example/lapack_to_chameleon/step4.h
+++ b/example/lapack_to_chameleon/step4.h
@@ -88,11 +88,7 @@ static void read_args(int argc, char *argv[], int *iparam){
  * Print a header message to summarize main parameters
  */
 static void print_header(char *prog_name, int * iparam) {
-#if defined(CHAMELEON_SIMULATION)
-    double    eps = 0.;
-#else
-    double    eps = LAPACKE_dlamch_work( 'e' );
-#endif
+    double eps = LAPACKE_dlamch_work( 'e' );
 
     printf( "#\n"
             "# CHAMELEON %d.%d.%d, %s\n"
diff --git a/example/lapack_to_chameleon/step5.h b/example/lapack_to_chameleon/step5.h
index e2ebf14d99f2d1feed0627ac45cc5f1b02c07778..8ecf015e4a41daaec0b5d85d1f0dd57f834d8f0f 100644
--- a/example/lapack_to_chameleon/step5.h
+++ b/example/lapack_to_chameleon/step5.h
@@ -103,11 +103,7 @@ static void read_args(int argc, char *argv[], int *iparam){
  * Print a header message to summarize main parameters
  */
 static void print_header(char *prog_name, int * iparam) {
-#if defined(CHAMELEON_SIMULATION)
-    double    eps = 0.;
-#else
-    double    eps = LAPACKE_dlamch_work( 'e' );
-#endif
+    double eps = LAPACKE_dlamch_work( 'e' );
 
     printf( "#\n"
             "# CHAMELEON %d.%d.%d, %s\n"
diff --git a/example/lapack_to_chameleon/step6.h b/example/lapack_to_chameleon/step6.h
index d60683987471c510aafa20ce55a6a87f0e358bcb..98043e257eedaa0225d06eb5f20877bdcd43880e 100644
--- a/example/lapack_to_chameleon/step6.h
+++ b/example/lapack_to_chameleon/step6.h
@@ -115,11 +115,7 @@ static void read_args(int argc, char *argv[], int *iparam){
  * Print a header message to summarize main parameters
  */
 static void print_header(char *prog_name, int * iparam) {
-#if defined(CHAMELEON_SIMULATION)
-    double    eps = 0.;
-#else
-    double    eps = LAPACKE_dlamch_work( 'e' );
-#endif
+    double eps = LAPACKE_dlamch_work( 'e' );
 
     printf( "#\n"
             "# CHAMELEON %d.%d.%d, %s\n"
diff --git a/example/lapack_to_chameleon/step7.h b/example/lapack_to_chameleon/step7.h
index ad975a20ba97de204732af99a660a8f4b080638f..7622f5ddbbe669e4cdf2810d761c0aa74181f2fb 100644
--- a/example/lapack_to_chameleon/step7.h
+++ b/example/lapack_to_chameleon/step7.h
@@ -165,11 +165,7 @@ static void read_args(int argc, char *argv[], int *iparam){
  * Print a header message to summarize main parameters
  */
 static void print_header(char *prog_name, int * iparam) {
-#if defined(CHAMELEON_SIMULATION)
-    double    eps = 0.;
-#else
-    double    eps = LAPACKE_dlamch_work( 'e' );
-#endif
+    double eps = LAPACKE_dlamch_work( 'e' );
 
     printf( "#\n"
             "# CHAMELEON %d.%d.%d, %s\n"
diff --git a/testing/chameleon_ztesting.c b/testing/chameleon_ztesting.c
index 9b7336c18fc0803900b087f878ca287c0dc97ac5..4c2dd37c0fa0b44dfd6ba4fd66a3cd99361683ae 100644
--- a/testing/chameleon_ztesting.c
+++ b/testing/chameleon_ztesting.c
@@ -167,7 +167,6 @@ int main (int argc, char **argv) {
 
     testing_options_init( &options );
 
-#if !defined(CHAMELEON_SIMULATION)
     /* Let's initialize the accuracy for the checks */
     {
 #if (defined(PRECISION_z) || defined(PRECISION_d))
@@ -178,10 +177,9 @@ int main (int argc, char **argv) {
         else
 #endif
         {
-            testing_setaccuracy( LAPACKE_dlamch_work('e') );
+            testing_setaccuracy( CHAMELEON_dlamch() );
         }
     }
-#endif
 
     rc = CHAMELEON_Init( options.threads, options.gpus );
     if ( rc != CHAMELEON_SUCCESS ) {
diff --git a/testing/vendor_ztesting.c b/testing/vendor_ztesting.c
index 72b484b214e496a8fd84aad8a1038b915ff3bffd..fd358eed9e022e752a801d201eac831f4a028093 100644
--- a/testing/vendor_ztesting.c
+++ b/testing/vendor_ztesting.c
@@ -118,10 +118,8 @@ int main (int argc, char **argv) {
 
     testing_options_init( &options );
 
-#if !defined(CHAMELEON_SIMULATION)
     /* Let's initialize the accuracy for the checks */
-    testing_setaccuracy( LAPACKE_dlamch_work('e') );
-#endif
+    testing_setaccuracy( CHAMELEON_dlamch() );
 
     rc = CHAMELEON_Init( options.threads, 0 );
     if ( rc != CHAMELEON_SUCCESS ) {