diff --git a/embed/serve.go b/embed/serve.go
index 68398da607b..27230e35d5b 100644
--- a/embed/serve.go
+++ b/embed/serve.go
@@ -291,8 +291,6 @@ func configureHttpServer(srv *http.Server, cfg etcdserver.ServerConfig) error {
 	// todo (ahrtr): should we support configuring other parameters in the future as well?
 	return http2.ConfigureServer(srv, &http2.Server{
 		MaxConcurrentStreams: cfg.MaxConcurrentStreams,
-		// Override to avoid using priority scheduler which is affected by https://github.com/golang/go/issues/58804.
-		NewWriteScheduler: http2.NewRandomWriteScheduler,
 	})
 }
 
diff --git a/tests/e2e/watch_delay_test.go b/tests/e2e/watch_delay_test.go
index 084eb4d770e..99e603de68c 100644
--- a/tests/e2e/watch_delay_test.go
+++ b/tests/e2e/watch_delay_test.go
@@ -57,25 +57,25 @@ var tcs = []testCase{
 	{
 		name:          "NoTLS",
 		config:        etcdProcessClusterConfig{clusterSize: 1},
-		maxWatchDelay: 100 * time.Millisecond,
+		maxWatchDelay: 150 * time.Millisecond,
 		dbSizeBytes:   5 * Mega,
 	},
 	{
 		name:          "TLS",
 		config:        etcdProcessClusterConfig{clusterSize: 1, isClientAutoTLS: true, clientTLS: clientTLS},
-		maxWatchDelay: 2 * time.Second,
-		dbSizeBytes:   500 * Kilo,
+		maxWatchDelay: 150 * time.Millisecond,
+		dbSizeBytes:   5 * Mega,
 	},
 	{
 		name:          "SeparateHttpNoTLS",
 		config:        etcdProcessClusterConfig{clusterSize: 1, clientHttpSeparate: true},
-		maxWatchDelay: 100 * time.Millisecond,
+		maxWatchDelay: 150 * time.Millisecond,
 		dbSizeBytes:   5 * Mega,
 	},
 	{
 		name:          "SeparateHttpTLS",
 		config:        etcdProcessClusterConfig{clusterSize: 1, isClientAutoTLS: true, clientTLS: clientTLS, clientHttpSeparate: true},
-		maxWatchDelay: 100 * time.Millisecond,
+		maxWatchDelay: 150 * time.Millisecond,
 		dbSizeBytes:   5 * Mega,
 	},
 }