diff --git a/crypto/evp/p5_crpt2_test.c b/crypto/evp/p5_crpt2_test.c
index ad57e1765..3527a21fe 100644
--- a/crypto/evp/p5_crpt2_test.c
+++ b/crypto/evp/p5_crpt2_test.c
@@ -137,7 +137,7 @@ convert(unsigned char *dst, const unsigned char *src, int len) {
 	*dst = 0;
 }
 
-void
+static void
 test_p5_pbkdf2(int i, char *digestname, testdata *test, const char *hex)
 {
 	const EVP_MD *digest;
@@ -218,7 +218,7 @@ int main(int argc,char **argv) {
 #endif
 	EVP_cleanup();
 	CRYPTO_cleanup_all_ex_data();
-	ERR_remove_state(0);
+	ERR_remove_thread_state(NULL);
 	ERR_free_strings();
 	CRYPTO_mem_leaks_fp(stderr);
 	return 0;