diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1566,14 +1566,8 @@
         self.successes = []
         self.faildata = {}
 
-        if not self.stream.isatty(): # check if the terminal is capable
-            options.color = False
-        elif options.color == 'auto':
-            options.color = pygmentspresent
-        elif options.color == 'never':
-            options.color = False
-        else: # 'always', for testing purposes
-            options.color = pygmentspresent
+        options.color = (pygmentspresent and self.stream.isatty() and
+                         options.color != 'never')
 
     def addFailure(self, test, reason):
         self.failures.append((test, reason))