diff --git a/git_cl/test/local_rietveld.py b/git_cl/test/local_rietveld.py
index 95e27b60b3..88071c467f 100644
--- a/git_cl/test/local_rietveld.py
+++ b/git_cl/test/local_rietveld.py
@@ -96,16 +96,16 @@ class LocalRietveld(object):
         self.install_prerequisites()
         self.port = find_free_port()
         if verbose:
-            stdout = None
-            stderr = None
+            self.out = None
+            self.err = None
         else:
-            stdout = subprocess.PIPE
-            stderr = subprocess.PIPE
+            self.out = open(os.devnull, 'w')
+            self.err = open(os.devnull, 'w')
         output = []
         self.test_server = subprocess.Popen(
             [self.dev_app, self.rietveld, '--port=%d' % self.port,
             '--datastore_path=' + os.path.join(self.rietveld, 'tmp.db'), '-c'],
-            stdout=stdout, stderr=stderr, env=self.env)
+            stdout=self.out, stderr=self.err, env=self.env)
         # Loop until port 127.0.0.1:port opens or the process dies.
         while not test_port(self.port):
             self.test_server.poll()
@@ -120,6 +120,12 @@ class LocalRietveld(object):
             self.test_server.kill()
             self.test_server = None
             self.port = None
+        if self.out:
+            self.out.close()
+            self.out = None
+        if self.err:
+            self.err.close()
+            self.err = None
 
 
 def main():