diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index 116826df391..c9d2ee27826 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -33,6 +33,7 @@ import subprocess;
 import sys
 import errno;
 from datetime import datetime,timedelta;
+import __builtin__
 
 srcPath = ''
 SettingsPath = ''
@@ -116,6 +117,16 @@ def waitForCleanShutdown(timeOut=10):
                     shutdownDone=True
             if not shutdownDone and datetime.utcnow() > endtime:
                 break
+        if platform.system() == 'Linux' and JIRA.isBugStillOpen(15749):
+            pgrepOutput = getOutputFromCmdline('pgrep -f qtcreator_process_stub')
+            pids = pgrepOutput.splitlines()
+            if len(pids):
+                print("Killing %d qtcreator_process_stub instances" % len(pids))
+            for pid in pids:
+                try:
+                    os.kill(__builtin__.int(pid), 9)
+                except OSError: # we might kill the parent before the current pid
+                    pass
 
 def checkForStillRunningQmlExecutable(possibleNames):
     for qmlHelper in possibleNames: