diff --git a/tools/remotecommand/remotecommand_test.go b/tools/remotecommand/remotecommand_test.go
index 77e309d6..d5485af8 100644
--- a/tools/remotecommand/remotecommand_test.go
+++ b/tools/remotecommand/remotecommand_test.go
@@ -208,7 +208,8 @@ func createHTTPStreams(w http.ResponseWriter, req *http.Request, opts *StreamOpt
 	}
 
 	// wait for stream
-	replyChan := make(chan struct{}, 1)
+	replyChan := make(chan struct{}, 4)
+	defer close(replyChan)
 	receivedStreams := 0
 	expectedStreams := 1
 	if opts.Stdout != nil {