diff --git a/crypto/evp_extra/evp_extra_test.cc b/crypto/evp_extra/evp_extra_test.cc
index 1261864a5c..c312d30626 100644
--- a/crypto/evp_extra/evp_extra_test.cc
+++ b/crypto/evp_extra/evp_extra_test.cc
@@ -1817,7 +1817,9 @@ TEST(EVPExtraTest, DHParamgen) {
     ASSERT_TRUE(raw_pkey);
 
     const DH* dh = EVP_PKEY_get0_DH(pkey.get());
+    ASSERT_TRUE(dh);
     const BIGNUM* p = DH_get0_p(dh);
+    ASSERT_TRUE(p);
     unsigned p_size = BN_num_bits(p);
     ASSERT_EQ(p_size, (unsigned)prime_len);
   }
diff --git a/crypto/fipsmodule/evp/evp_ctx_test.cc b/crypto/fipsmodule/evp/evp_ctx_test.cc
index 1889b5d56b..96b2e4fe67 100644
--- a/crypto/fipsmodule/evp/evp_ctx_test.cc
+++ b/crypto/fipsmodule/evp/evp_ctx_test.cc
@@ -260,7 +260,9 @@ TEST_F(EvpPkeyCtxCtrlStrTest, DhParamGen) {
   ASSERT_TRUE(raw);
 
   const DH* dh = EVP_PKEY_get0_DH(pkey.get());
+  ASSERT_TRUE(dh);
   const BIGNUM* p = DH_get0_p(dh);
+  ASSERT_TRUE(p);
   unsigned p_size = BN_num_bits(p);
   ASSERT_EQ(p_size, 256u);
 }