diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 75bdd1f..4c43620 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -50,7 +50,7 @@
 
 int main( int argc, char *argv[] )
 {
-    int ret, v;
+    int ret = 0, v;
 
     if( argc == 2 && strcmp( argv[1], "-quiet" ) == 0 )
         v = 0;
@@ -60,6 +60,8 @@
         printf( "\n" );
     }
 
+#if defined(POLARSSL_SELF_TEST)
+
 #if defined(POLARSSL_MD2_C)
     if( ( ret = md2_self_test( v ) ) != 0 )
         return( ret );
@@ -135,6 +137,10 @@
         return( ret );
 #endif
 
+#else
+    printf( " POLARSSL_SELF_TEST not defined.\n" );
+#endif
+
     if( v != 0 )
     {
         printf( "  [ All tests passed ]\n\n" );