diff --git a/tests/harmattan/testscripts/signal-forward/fala_inv_sf.py b/tests/harmattan/testscripts/signal-forward/fala_inv_sf.py
index d6b1bdd..c53e8df 100755
--- a/tests/harmattan/testscripts/signal-forward/fala_inv_sf.py
+++ b/tests/harmattan/testscripts/signal-forward/fala_inv_sf.py
@@ -7,7 +7,7 @@ import commands
 os.system("/usr/share/applauncherd-testscripts/signal-forward/fala_sf_m.sh &")
 
 time.sleep(2)
-st, op = commands.getstatusoutput("ps ax | grep fala_ft_hello | grep invoker")
+st, op = commands.getstatusoutput("pgrep -lf 'invoker --type=m --wait-term /usr/bin/fala_ft_hello'")
 op = op.split("\n")[0].split(" ")[0]
 
 #Killing application with a signal 11 (Segmentation Fault)
diff --git a/tests/harmattan/testscripts/test-invoker.py b/tests/harmattan/testscripts/test-invoker.py
index ef0f982..956fa9b 100644
--- a/tests/harmattan/testscripts/test-invoker.py
+++ b/tests/harmattan/testscripts/test-invoker.py
@@ -105,6 +105,7 @@ class InvokerTests(unittest.TestCase):
         os.system("ln -s /usr/bin/fala_wl /usr/bin/fala_link")
         cmd = "/usr/bin/invoker --type=m /usr/bin/fala_link"
         os.system('su - user -c "%s"&' %cmd)
+        time.sleep(3)
         pid = get_pid("fala_link")
         os.system("rm /usr/bin/fala_link")
         kill_process("fala_link")