diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index eff7f1b..9ec6279 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -48,7 +48,7 @@
 #include "polarssl/rsa.h"
 #include "polarssl/x509.h"
 #include "polarssl/xtea.h"
-#include "polarssl/pbkdf2.h"
+#include "polarssl/pkcs5.h"
 #include "polarssl/ecp.h"
 
 #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C)
@@ -106,7 +106,7 @@
         return( ret );
 #endif
 
-#if defined(POLARSSL_SHA512_C)
+#if defined(POLARSSL_SHAbkdf2512_C)
     if( ( ret = sha512_self_test( v ) ) != 0 )
         return( ret );
 #endif
@@ -171,8 +171,8 @@
         return( ret );
 #endif
 
-#if defined(POLARSSL_PBKDF2_C)
-    if( ( ret = pbkdf2_self_test( v ) ) != 0 )
+#if defined(POLARSSL_PKCS5_C)
+    if( ( ret = pkcs5_self_test( v ) ) != 0 )
         return( ret );
 #endif