diff --git a/avocado/job.py b/avocado/job.py
index f8524b79f642a2a70ae33501c52eb22309c00e6d..8357387d7e7626be4bb99ee246f6443cf29caea9 100644
--- a/avocado/job.py
+++ b/avocado/job.py
@@ -50,6 +50,7 @@ class TestRunner(object):
     """
     A test runner class that displays tests results.
     """
+    DEFAULT_TIMEOUT = 60 * 60 * 24
 
     def __init__(self, job, test_result):
         """
@@ -159,24 +160,22 @@ class TestRunner(object):
             p = multiprocessing.Process(target=self.run_test,
                                         args=(params, q,))
 
-            # Change in behaviour: timeout now comes *only* from test params
-            timeout = params.get('timeout')
-            if timeout is not None:
-                timeout = float(timeout)
-            else:
-                # fallback timeout is really long. less of a problem now since
-                # we give feedback on the test process being alive
-                timeout = 60 * 60 * 24
-
             cycle_timeout = 1
             time_started = time.time()
-            time_deadline = time_started + timeout - cycle_timeout
             should_quit = False
             test_state = None
 
             p.start()
 
             early_state = q.get()
+            # At this point, the test is already initialized and we know
+            # for sure if there's a timeout set.
+            if 'timeout' in early_state['params'].keys():
+                timeout = float(early_state['params']['timeout'])
+            else:
+                timeout = self.DEFAULT_TIMEOUT
+
+            time_deadline = time_started + timeout - cycle_timeout
 
             while not should_quit:
                 try:
diff --git a/avocado/plugins/multiplexer.py b/avocado/plugins/multiplexer.py
index a82fac2d42e810ce5fdc337c9e4f4d745c64f953..b94e8e51fd729675e5a9bf872531ea27f24b46b9 100644
--- a/avocado/plugins/multiplexer.py
+++ b/avocado/plugins/multiplexer.py
@@ -46,7 +46,7 @@ class Multiplexer(plugin.Plugin):
         self.configured = True
 
     def multiplex(self, args):
-        bcolors = output.colors
+        bcolors = output.term_support
         pipe = output.get_paginator()
 
         if not args.multiplex_file: