diff --git a/timing/CTestLists.cmake b/timing/CTestLists.cmake
index 5f39d14de3df6d29c1b669eee4d2886cc7173309..dc2093c527ecff9696921debe5530389e4849fab 100644
--- a/timing/CTestLists.cmake
+++ b/timing/CTestLists.cmake
@@ -39,7 +39,7 @@ foreach(cat ${TEST_CATEGORIES})
 
         if (CHAMELEON_PREC_${PREC})
             foreach(test ${TESTLIST})
-                add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --nowarmup)
+                add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --warmup)
             endforeach()
         endif()
     endforeach()
@@ -48,7 +48,7 @@ foreach(cat ${TEST_CATEGORIES})
 
         if (CHAMELEON_PREC_${PREC})
             foreach(test ${TESTLIST_ZC})
-                add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --nowarmup)
+                add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --warmup)
             endforeach()
         endif()
     endforeach()
@@ -71,7 +71,7 @@ if (CHAMELEON_USE_MPI AND MPI_C_FOUND)
 
             if (CHAMELEON_PREC_${PREC})
                 foreach(test ${TESTLIST_MPI})
-                    add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --nowarmup)
+                    add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --warmup)
                 endforeach()
             endif()
         endforeach()
diff --git a/timing/timing.c b/timing/timing.c
index 7e7ed6f8ad4a74a25ac01947f6a36698ba045836..3cd1ddb291693c1b964ab4f481f5128e3be02383 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -346,7 +346,7 @@ show_help(char *prog_name) {
             "  --[a]sync        Enable/Disable synchronous calls in wrapper function such as POTRI. (default: async)\n"
             "  --[no]check      Check result (default: nocheck)\n"
             "  --[no]inv        Check on inverse (default: noinv)\n"
-            "  --[no]warmup     Perform a warmup run to pre-load libraries (default: nowarmup)\n"
+            "  --[no]warmup     Perform a warmup run to pre-load libraries (default: warmup)\n"
             "  --[no]trace      Enable/Disable trace generation (default: notrace)\n"
             "  --[no]dag        Enable/Disable DAG generation (default: nodag)\n"
             "                   Generates a dot_dag_file.dot.\n"
@@ -461,7 +461,7 @@ main(int argc, char *argv[]) {
     iparam[IPARAM_NB            ] = 128;
     iparam[IPARAM_IB            ] = 32;
     iparam[IPARAM_NITER         ] = 1;
-    iparam[IPARAM_WARMUP        ] = 0;
+    iparam[IPARAM_WARMUP        ] = 1;
     iparam[IPARAM_CHECK         ] = 0;
     iparam[IPARAM_VERBOSE       ] = 0;
     iparam[IPARAM_AUTOTUNING    ] = 0;