diff --git a/commands_test.go b/commands_test.go
index 1be4a2abe0..9615e877e6 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -239,11 +239,8 @@ func TestRunDisconnectTty(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	// as the pipes are close, we expect the process to die,
-	// therefore CmdRun to unblock. Wait for CmdRun
-	setTimeout(t, "Waiting for CmdRun timed out", 2*time.Second, func() {
-		<-c1
-	})
+	// In tty mode, we expect the process to stay alive even after client's stdin closes.
+	// Do not wait for run to finish
 
 	// Client disconnect after run -i should keep stdin out in TTY mode
 	container := runtime.List()[0]