diff --git a/quic/core/crypto/quic_crypto_client_config_test.cc b/quic/core/crypto/quic_crypto_client_config_test.cc
index 95f76c6..4b6dcd7 100644
--- a/quic/core/crypto/quic_crypto_client_config_test.cc
+++ b/quic/core/crypto/quic_crypto_client_config_test.cc
@@ -10,6 +10,7 @@
 #include "net/third_party/quiche/src/quic/core/quic_server_id.h"
 #include "net/third_party/quiche/src/quic/core/quic_types.h"
 #include "net/third_party/quiche/src/quic/core/quic_utils.h"
+#include "net/third_party/quiche/src/quic/platform/api/quic_expect_bug.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
 #include "net/third_party/quiche/src/quic/test_tools/crypto_test_utils.h"
 #include "net/third_party/quiche/src/quic/test_tools/mock_random.h"
@@ -115,9 +116,9 @@
 TEST_F(QuicCryptoClientConfigTest, CachedState_ServerIdConsumedBeforeSet) {
   QuicCryptoClientConfig::CachedState state;
   EXPECT_FALSE(state.has_server_designated_connection_id());
-  EXPECT_QUIC_DEBUG_DEATH(state.GetNextServerDesignatedConnectionId(),
-                          "Attempting to consume a connection id "
-                          "that was never designated.");
+  EXPECT_QUIC_BUG(state.GetNextServerDesignatedConnectionId(),
+                  "Attempting to consume a connection id "
+                  "that was never designated.");
 }
 
 TEST_F(QuicCryptoClientConfigTest, CachedState_ServerNonce) {
@@ -154,9 +155,9 @@
 TEST_F(QuicCryptoClientConfigTest, CachedState_ServerNonceConsumedBeforeSet) {
   QuicCryptoClientConfig::CachedState state;
   EXPECT_FALSE(state.has_server_nonce());
-  EXPECT_QUIC_DEBUG_DEATH(state.GetNextServerNonce(),
-                          "Attempting to consume a server nonce "
-                          "that was never designated.");
+  EXPECT_QUIC_BUG(state.GetNextServerNonce(),
+                  "Attempting to consume a server nonce "
+                  "that was never designated.");
 }
 
 TEST_F(QuicCryptoClientConfigTest, CachedState_InitializeFrom) {
diff --git a/quic/core/quic_interval_deque_test.cc b/quic/core/quic_interval_deque_test.cc
index 8d57d5f..f7a8441 100644
--- a/quic/core/quic_interval_deque_test.cc
+++ b/quic/core/quic_interval_deque_test.cc
@@ -82,8 +82,7 @@
   qid.PopFront();
   EXPECT_EQ(qid.Size(), std::size_t(0));
 
-  EXPECT_QUIC_DEBUG_DEATH(qid.PopFront(),
-                          "Trying to pop from an empty container.");
+  EXPECT_QUIC_BUG(qid.PopFront(), "Trying to pop from an empty container.");
 }
 
 // The goal of this test is to push data into the container at specific