diff --git a/library/timing.c b/library/timing.c
index 7085b3b6a6..d8b5b46287 100644
--- a/library/timing.c
+++ b/library/timing.c
@@ -326,6 +326,9 @@ void m_sleep( int milliseconds )
 
 /*
  * Checkup routine
+ *
+ * Warning: this is work in progress, some tests may not be reliable enough
+ * yet! False positives may happen.
  */
 int timing_self_test( int verbose )
 {
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 82477e5079..ba6e1d5c4d 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -195,7 +195,10 @@ int main( int argc, char *argv[] )
 #endif
 #endif
 
-#if defined(POLARSSL_TIMING_C)
+/*
+ * Not reliable enough yet
+ */
+#if 0 && defined(POLARSSL_TIMING_C)
     if( ( ret = timing_self_test( v ) ) != 0 )
         return( ret );
 #endif