diff --git a/.gitignore b/.gitignore
index d8ba349..b85cf10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,6 +74,7 @@ tests/cipher*
 tests/constraints*
 tests/ec_point_conversion*
 tests/evp_pkey_check*
+tests/evp_pkey_cleanup*
 tests/explicit_bzero*
 tests/freenull*
 tests/gost2814789t*
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fb7e499..7c80002 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,6 +4,7 @@ include_directories(
 	.
 	../crypto/asn1
 	../crypto/bio
+	../crypto/evp
 	../crypto/modes
 	../crypto/x509
 	../ssl
@@ -243,6 +244,11 @@ add_executable(evp_pkey_check evp_pkey_check.c)
 target_link_libraries(evp_pkey_check ${OPENSSL_TEST_LIBS})
 add_test(evp_pkey_check evp_pkey_check)
 
+# evp_pkey_cleanup
+add_executable(evp_pkey_cleanup evp_pkey_cleanup.c)
+target_link_libraries(evp_pkey_cleanup ${OPENSSL_TEST_LIBS})
+add_test(evp_pkey_cleanup evp_pkey_cleanup)
+
 # evptest
 add_executable(evptest evptest.c)
 target_link_libraries(evptest ${OPENSSL_TEST_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bea03b5..e58c0c0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS += -DLIBRESSL_CRYPTO_INTERNAL
 
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/bio
+AM_CPPFLAGS += -I $(top_srcdir)/crypto/evp
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/modes
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/x509
 AM_CPPFLAGS += -I $(top_srcdir)/ssl
@@ -255,6 +256,11 @@ TESTS += evp_pkey_check
 check_PROGRAMS += evp_pkey_check
 evp_pkey_check_SOURCES = evp_pkey_check.c
 
+# evp_pkey_cleanup
+TESTS += evp_pkey_cleanup
+check_PROGRAMS += evp_pkey_cleanup
+evp_pkey_cleanup_SOURCES = evp_pkey_cleanup.c
+
 # evptest
 TESTS += evptest.sh
 check_PROGRAMS += evptest