diff --git a/tests/Harmattan/TestScripts/test-func-launcher.py b/tests/Harmattan/TestScripts/test-func-launcher.py
index e024ab6..4399406 100644
--- a/tests/Harmattan/TestScripts/test-func-launcher.py
+++ b/tests/Harmattan/TestScripts/test-func-launcher.py
@@ -80,6 +80,7 @@ class launcher_tests (unittest.TestCase):
         debug("Executing TearDown")
         if get_pid('applauncherd') == None:
             os.system('initctl start xsession/applauncherd')
+        time.sleep(5)
 
     #Testcases
     def test_launcher_exist(self):
@@ -613,6 +614,7 @@ class launcher_tests (unittest.TestCase):
 
         p = run_app_as_user('invoker --respawn 256 --type=q --no-wait fala_ft_hello.launch')
         self.assert_(p.wait() != 0, "invoker didn't die with too big respawn delay")
+        kill_process('fala_ft_hello')
 
     def test_invoker_bogus_apptype(self):
         p = run_app_as_user('invoker --type=foobar fala_ft_hello.launch')
@@ -668,6 +670,9 @@ class launcher_tests (unittest.TestCase):
         """
         Stress test for boosted applications to check only one instance is running.
         """
+        if get_pid('fala_ft_hello') != None:
+            kill_process('fala_ft_hello')
+        time.sleep(2)
         count = 0
         p = run_app_as_user('invoker --type=m --no-wait fala_ft_hello.launch')
         pid = get_pid('fala_ft_hello')
diff --git a/tests/Harmattan/bug-tests/tests.xml b/tests/Harmattan/bug-tests/tests.xml
index 9693c05..bb8356a 100644
--- a/tests/Harmattan/bug-tests/tests.xml
+++ b/tests/Harmattan/bug-tests/tests.xml
@@ -14,13 +14,13 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-security.py test_correct_creds</step>
       </case>
 
-      <case name="applauncherd__test_application_specific_theming" type="Functional" description="Application specific theming tests" timeout="360" level="System" insignificant="true">
-          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/tc_theming.rb --name test_application_specific_theming</step>
+      <!--case name="applauncherd__test_application_specific_theming" type="Functional" description="Application specific theming tests" timeout="360" level="System" insignificant="true">
+          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/tc_theming.rb name test_application_specific_theming</step>
       </case>
 
       <case name="applauncherd__test_global_theming" type="Functional" description="Tests that global theming changes affect launched applications" timeout="360" level="System" insignificant="true">
-        <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/tc_theming.rb --name test_global_theming</step>
-      </case>
+        <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/tc_theming.rb name test_global_theming</step>
+      </case-->
 
       <case name="applauncherd__test_oom_adj" type="Functional" description="Test that oom.adj is 0 for launched application process" timeout="360" level="System" insignificant="true">
         <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_oom_adj</step>
@@ -34,15 +34,15 @@
         <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_stress_boosted_apps</step>
       </case>
 
-      <case name="invoker_param_creds" type="Functional" description="test invoker --creds" timeout="360" level="System" insignificant="true">
+      <case name="applauncherd__test_invoker_param_creds" type="Functional" description="test invoker --creds" timeout="360" level="System" insignificant="true">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_invoker_param_creds</step>
       </case>
 
-      <case name="invoker_param_respawn_delay" type="Functional" description="test invoker --respawn" timeout="360" level="System" insignificant="true">
+      <case name="applauncherd__test_invoker_param_respawn_delay" type="Functional" description="test invoker --respawn" timeout="360" level="System" insignificant="true">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_invoker_param_respawn_delay</step>
       </case>
 
-      <case name="invoker_bogus_apptype" type="Functional" description="test giving bogus apptype to invoker" timeout="360" level="System" insignificant="true">
+      <case name="applauncherd__test_invoker_bogus_apptype" type="Functional" description="test giving bogus apptype to invoker" timeout="360" level="System" insignificant="true">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_invoker_bogus_apptype</step>
       </case>