diff --git a/build/source_list.bzl b/build/source_list.bzl
index c3070a0..8b92c14 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -1401,6 +1401,7 @@
     "common/platform/default/quiche_platform_impl/quiche_file_utils_impl.cc",
 ]
 default_platform_impl_test_support_hdrs = [
+    "common/platform/default/quiche_platform_impl/quiche_expect_bug_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_test_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_test_loopback_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_test_output_impl.h",
diff --git a/build/source_list.gni b/build/source_list.gni
index dd628e5..4b2f8f8 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -1401,6 +1401,7 @@
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_file_utils_impl.cc",
 ]
 default_platform_impl_test_support_hdrs = [
+    "src/quiche/common/platform/default/quiche_platform_impl/quiche_expect_bug_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_test_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_test_loopback_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_test_output_impl.h",
diff --git a/build/source_list.json b/build/source_list.json
index e48fb42..37a1d63 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -1400,6 +1400,7 @@
     "quiche/common/platform/default/quiche_platform_impl/quiche_file_utils_impl.cc"
   ],
   "default_platform_impl_test_support_hdrs": [
+    "quiche/common/platform/default/quiche_platform_impl/quiche_expect_bug_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_test_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_test_loopback_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_test_output_impl.h",
diff --git a/quiche/common/platform/default/quiche_platform_impl/quiche_bug_tracker_impl.h b/quiche/common/platform/default/quiche_platform_impl/quiche_bug_tracker_impl.h
index 913300f..2725f94 100644
--- a/quiche/common/platform/default/quiche_platform_impl/quiche_bug_tracker_impl.h
+++ b/quiche/common/platform/default/quiche_platform_impl/quiche_bug_tracker_impl.h
@@ -7,8 +7,9 @@
 
 #include "quiche/common/platform/api/quiche_logging.h"
 
-#define QUICHE_BUG_IMPL(b) QUICHE_LOG(DFATAL)
-#define QUICHE_BUG_IF_IMPL(b, condition) QUICHE_LOG_IF(DFATAL, condition)
+#define QUICHE_BUG_IMPL(b) QUICHE_LOG(DFATAL) << #b ": "
+#define QUICHE_BUG_IF_IMPL(b, condition) \
+  QUICHE_LOG_IF(DFATAL, condition) << #b ": "
 #define QUICHE_PEER_BUG_IMPL(b) QUICHE_LOG(DFATAL)
 #define QUICHE_PEER_BUG_IF_IMPL(b, condition) QUICHE_LOG_IF(DFATAL, condition)
 
diff --git a/quiche/common/platform/default/quiche_platform_impl/quiche_expect_bug_impl.h b/quiche/common/platform/default/quiche_platform_impl/quiche_expect_bug_impl.h
new file mode 100644
index 0000000..89b5556
--- /dev/null
+++ b/quiche/common/platform/default/quiche_platform_impl/quiche_expect_bug_impl.h
@@ -0,0 +1,15 @@
+// Copyright 2022 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef QUICHE_COMMON_PLATFORM_DEFAULT_QUICHE_PLATFORM_IMPL_QUICHE_EXPECT_BUG_IMPL_H_
+#define QUICHE_COMMON_PLATFORM_DEFAULT_QUICHE_PLATFORM_IMPL_QUICHE_EXPECT_BUG_IMPL_H_
+
+#include "quiche/common/platform/api/quiche_test.h"
+
+#define EXPECT_QUICHE_BUG_IMPL(statement, regex) \
+  EXPECT_QUICHE_DEBUG_DEATH(statement, regex)
+#define EXPECT_QUICHE_PEER_BUG_IMPL(statement, regex) \
+  EXPECT_QUICHE_DEBUG_DEATH(statement, regex)
+
+#endif  // QUICHE_COMMON_PLATFORM_DEFAULT_QUICHE_PLATFORM_IMPL_QUICHE_EXPECT_BUG_IMPL_H_