diff --git a/library/x509parse.c b/library/x509parse.c
index 79bb0a6ed..70dd71c1f 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -2486,7 +2486,7 @@ int x509_self_test( int verbose )
     if( verbose != 0 )
         printf( "passed\n  X.509 signature verify: ");
 
-    ret = x509parse_verify( &clicert, &cacert, NULL, "Joe User", &i );
+    ret = x509parse_verify( &clicert, &cacert, NULL, "PolarSSL Client 2", &i );
     if( ret != 0 )
     {
         if( verbose != 0 )
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 82c002a99..22ace15da 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -117,7 +117,7 @@ int main( int argc, char *argv[] )
         return( ret );
 #endif
 
-#if defined(POLARSSL_X509_C)
+#if defined(POLARSSL_X509_PARSE_C)
     if( ( ret = x509_self_test( v ) ) != 0 )
         return( ret );
 #endif