diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 7908dcccdb8a8d0552059f4f802537a30cc1ecff..452a0822d9a3e2a4f87ce4f2aae27f6e31a96e02 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -296,7 +296,7 @@ CERT *ssl_cert_dup(CERT *cert)
 
 	return(ret);
 	
-#ifndef OPENSSL_NO_DH /* avoid 'unreferenced label' warning if OPENSSL_NO_DH is defined */
+#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_ECDH)
 err:
 #endif
 #ifndef OPENSSL_NO_RSA
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 9b7a387ba39d3f3e27956bbe1f846e2756688949..dfe18b0f1cd101941c6f18a89049f6126910ff44 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -2234,6 +2234,7 @@ static DH *get_dh1024dsa()
 	dh->length = 160;
 	return(dh);
 	}
+#endif
 
 static int do_test_cipherlist(void)
 	{
@@ -2291,4 +2292,3 @@ static int do_test_cipherlist(void)
 
 	return 1;
 	}
-#endif