diff --git a/control/auxiliary.c b/control/auxiliary.c
index 37d657fbfdc95045ab1c27fc7bd12854cfee97b8..14fd016ed7a9da87227a87502f7b43c87ca91a08 100644
--- a/control/auxiliary.c
+++ b/control/auxiliary.c
@@ -115,11 +115,15 @@ int morse_rank(MORSE_context_t *morse)
  **/
 int morse_tune(MORSE_enum func, int M, int N, int NRHS)
 {
+    MORSE_context_t *morse;
+    morse = morse_context_self();
+    if ( morse && morse->autotuning_enabled == MORSE_TRUE ) {
+        morse_warning( "morse_tune", "Autotunning not available for now" );
+    }
     (void)func;
     (void)M;
     (void)N;
     (void)NRHS;
-    morse_warning( "morse_tune", "Autotunning not available for now" );
     return MORSE_SUCCESS;
 }
 
diff --git a/testing/testing_zauxiliary.c b/testing/testing_zauxiliary.c
index 8463f670f51cae08bc7b9969d21d1ca83fd555f8..60be56b932ffbfba7ad210f7d9d709ee795f9f0a 100644
--- a/testing/testing_zauxiliary.c
+++ b/testing/testing_zauxiliary.c
@@ -184,6 +184,9 @@ int main (int argc, char **argv)
      MORSE_InitPar(ncores/nthreads_per_worker, ncudas, nthreads_per_worker);
      else*/
     MORSE_Init( ncores, ngpus);
+    MORSE_Disable(MORSE_AUTOTUNING);
+    MORSE_Set(MORSE_TILE_SIZE,        320 );
+    MORSE_Set(MORSE_INNER_BLOCK_SIZE,  48 );
 
     argc -= 4;
     argv += 4;