diff --git a/tools/http2_interop/http2interop_test.go b/tools/http2_interop/http2interop_test.go
index e04c914d05e61762412bb8b7f2a81bf6ecabe474..fb314da1964a099a4d9c855339439148d3e3db69 100644
--- a/tools/http2_interop/http2interop_test.go
+++ b/tools/http2_interop/http2interop_test.go
@@ -68,7 +68,7 @@ func (ctx *HTTP2InteropCtx) Close() error {
 	return nil
 }
 
-func TestClientShortSettings(t *testing.T) {
+func TestSoonClientShortSettings(t *testing.T) {
 	defer Report(t)
 	if *testCase != "framing" {
 		t.SkipNow()
@@ -80,7 +80,7 @@ func TestClientShortSettings(t *testing.T) {
 	}
 }
 
-func TestShortPreface(t *testing.T) {
+func TestSoonShortPreface(t *testing.T) {
 	defer Report(t)
 	if *testCase != "framing" {
 		t.SkipNow()
@@ -92,7 +92,7 @@ func TestShortPreface(t *testing.T) {
 	}
 }
 
-func TestUnknownFrameType(t *testing.T) {
+func TestSoonUnknownFrameType(t *testing.T) {
 	defer Report(t)
 	if *testCase != "framing" {
 		t.SkipNow()
@@ -103,7 +103,7 @@ func TestUnknownFrameType(t *testing.T) {
 	}
 }
 
-func TestClientPrefaceWithStreamId(t *testing.T) {
+func TestSoonClientPrefaceWithStreamId(t *testing.T) {
 	defer Report(t)
 	if *testCase != "framing" {
 		t.SkipNow()
@@ -113,7 +113,7 @@ func TestClientPrefaceWithStreamId(t *testing.T) {
 	matchError(t, err, "EOF")
 }
 
-func TestTLSApplicationProtocol(t *testing.T) {
+func TestSoonTLSApplicationProtocol(t *testing.T) {
 	defer Report(t)
 	if *testCase != "tls" {
 		t.SkipNow()
@@ -123,7 +123,7 @@ func TestTLSApplicationProtocol(t *testing.T) {
 	matchError(t, err, "EOF", "broken pipe")
 }
 
-func TestTLSMaxVersion(t *testing.T) {
+func TestSoonTLSMaxVersion(t *testing.T) {
 	defer Report(t)
 	if *testCase != "tls" {
 		t.SkipNow()
@@ -135,7 +135,7 @@ func TestTLSMaxVersion(t *testing.T) {
 	matchError(t, err, "EOF", "server selected unsupported protocol")
 }
 
-func TestTLSBadCipherSuites(t *testing.T) {
+func TestSoonTLSBadCipherSuites(t *testing.T) {
 	defer Report(t)
 	if *testCase != "tls" {
 		t.SkipNow()