diff --git a/test.py b/test.py
index af9cf105d5..b109b98d9d 100755
--- a/test.py
+++ b/test.py
@@ -7,7 +7,7 @@ import subprocess
 import threading
 
 
-PPSSPP_EXECUTABLES = [ "Windows\\Release\\PPSSPPHeadless.exe", "build/PPSSPPHeadless" ]
+PPSSPP_EXECUTABLES = [ "Windows\\Release\\PPSSPPHeadless.exe", "build/PPSSPPHeadless","./PPSSPPHeadless" ]
 PPSSPP_EXE = None
 TEST_ROOT = "pspautotests/tests/"
 teamcity_mode = False
@@ -32,6 +32,10 @@ class Command(object):
     thread.join(timeout)
     if thread.isAlive():
       self.timeout = True
+      if sys.version_info < (2, 6):
+        os.kill(process.pid, signal.SIGKILL)
+      else:
+        process.terminate()
       self.process.terminate()
       thread.join()