diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index ee31fdc..8dddf34 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -49,6 +49,7 @@
 #include "polarssl/rsa.h"
 #include "polarssl/x509.h"
 #include "polarssl/xtea.h"
+#include "polarssl/pbkdf2.h"
 
 int main( int argc, char *argv[] )
 {
@@ -149,6 +150,11 @@
         return( ret );
 #endif
 
+#if defined(POLARSSL_PBKDF2_C)
+    if( ( ret = pbkdf2_self_test( v ) ) != 0 )
+        return( ret );
+#endif
+
 #else
     printf( " POLARSSL_SELF_TEST not defined.\n" );
 #endif