diff --git a/test/pseudo-tty/stdin-setrawmode.out b/test/pseudo-tty/stdin-setrawmode.out
new file mode 100644
index 00000000000000..8b137891791fe9
--- /dev/null
+++ b/test/pseudo-tty/stdin-setrawmode.out
@@ -0,0 +1 @@
+
diff --git a/tools/test.py b/tools/test.py
index 4a272475ccfffc..c8edca2b991ad2 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -683,11 +683,12 @@ def Execute(args, context, timeout=None, env={}, faketty=False):
   if faketty:
     import pty
     (out_master, fd_out) = pty.openpty()
-    fd_err = fd_out
+    fd_in = fd_err = fd_out
     pty_out = out_master
   else:
     (fd_out, outname) = tempfile.mkstemp()
     (fd_err, errname) = tempfile.mkstemp()
+    fd_in = 0
     pty_out = None
 
   # Extend environment
@@ -699,6 +700,7 @@ def Execute(args, context, timeout=None, env={}, faketty=False):
     context,
     timeout,
     args = args,
+    stdin = fd_in,
     stdout = fd_out,
     stderr = fd_err,
     env = env_copy,