diff --git a/quic/test_tools/quic_test_utils.cc b/quic/test_tools/quic_test_utils.cc
index 38873dd..100f4e9 100644
--- a/quic/test_tools/quic_test_utils.cc
+++ b/quic/test_tools/quic_test_utils.cc
@@ -1147,10 +1147,13 @@
 QuicStreamId GetNthClientInitiatedBidirectionalStreamId(
     QuicTransportVersion version,
     int n) {
+  int num = n;
+  if (!VersionLacksHeadersStream(version)) {
+    num++;  // + 1 because spdy_session contains headers stream.
+  }
   return QuicUtils::GetFirstBidirectionalStreamId(version,
                                                   Perspective::IS_CLIENT) +
-         // + 1 because spdy_session contains headers stream.
-         QuicUtils::StreamIdDelta(version) * (n + 1);
+         QuicUtils::StreamIdDelta(version) * num;
 }
 
 QuicStreamId GetNthServerInitiatedBidirectionalStreamId(