diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 8a8a820..eff7f1b 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "polarssl/hmac_drbg.h"
 #include "polarssl/ctr_drbg.h"
 #include "polarssl/dhm.h"
 #include "polarssl/gcm.h"
@@ -140,7 +141,7 @@
         return( ret );
 #endif
 
-#if defined(POLARSSL_RSA_C) && defined(POLARSSL_BIGNUM_C)
+#if defined(POLARSSL_RSA_C)
     if( ( ret = rsa_self_test( v ) ) != 0 )
         return( ret );
 #endif
@@ -165,6 +166,11 @@
         return( ret );
 #endif
 
+#if defined(POLARSSL_HMAC_DRBG_C)
+    if( ( ret = hmac_drbg_self_test( v ) ) != 0 )
+        return( ret );
+#endif
+
 #if defined(POLARSSL_PBKDF2_C)
     if( ( ret = pbkdf2_self_test( v ) ) != 0 )
         return( ret );