--- a/test/testemulation.py	Fri Feb 21 13:35:07 2014 +0100
+++ b/test/testemulation.py	Sun Feb 23 16:24:01 2014 +0100
@@ -21,7 +21,7 @@
     def tearDown(self):
         os.chdir(testdir)
 
-    def runQemu(self, kernel, timespan=2):
+    def runQemu(self, kernel):
         args = ['qemu-system-arm', '-M', 'lm3s811evb', '-m', '16M', 
             '-nographic', '-kernel', kernel, '-monitor',
             'unix:qemucontrol.sock,server',
@@ -35,7 +35,7 @@
         qemu_control = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
         qemu_control.connect('qemucontrol.sock')
 
-        time.sleep(2.5)
+        time.sleep(0.5)
 
         # Now connect to the serial output:
         qemu_serial = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@@ -47,9 +47,7 @@
 
         # Send quit command:
         qemu_control.send("quit\n".encode('ascii'))
-
-        p.wait(timeout=timespan)
-
+        p.wait(timeout=3)
         qemu_control.close()
         qemu_serial.close()