diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index 6da5d4b2473a462183a2e497f56850e1cd00fa0e..bebfb24e42457c79ffd639d68db2c93203d71e21 100644
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -65,6 +65,7 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
 
 
 #include <openssl/ec.h>
+#include <openssl/engine.h>
 #include <openssl/err.h>
 
 #define ABORT do { \
@@ -617,6 +618,7 @@ int main(int argc, char *argv[])
 	if (P_384) EC_GROUP_free(P_384);
 	if (P_521) EC_GROUP_free(P_521);
 
+	ENGINE_cleanup();
 	ERR_free_strings();
 	ERR_remove_state(0);
 	CRYPTO_mem_leaks_fp(stderr);
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index a19f70380cb762f62f4c6a19ffef521522d65a54..0960c1acbcbddbb6ea000b74baa694fa41ac15c1 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -124,6 +124,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
+#include <openssl/engine.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #ifdef OPENSSL_SYS_WINDOWS
@@ -704,6 +705,7 @@ end:
 #ifndef OPENSSL_NO_RSA
 	free_tmp_rsa();
 #endif
+	ENGINE_cleanup();
 	ERR_free_strings();
 	ERR_remove_state(0);
 	EVP_cleanup();