diff --git a/src/bitmessagekivy/tests/telenium_process.py b/src/bitmessagekivy/tests/telenium_process.py
index 97a0d584..94745612 100644
--- a/src/bitmessagekivy/tests/telenium_process.py
+++ b/src/bitmessagekivy/tests/telenium_process.py
@@ -54,15 +54,7 @@ class TeleniumTestProcess(TeleniumTestCase):
     def tearDownClass(cls):
         """Ensures that pybitmessage stopped and removes files"""
         # pylint: disable=no-member
-        try:
-            cls.cli.app_quit()
-        except:
-            pass
-
-        try:
-            cls.process.kill()
-        except:
-            pass
+        super(TeleniumTestProcess, cls).tearDownClass()
         cleanup()
 
     def assert_wait_no_except(self, selector, timeout=-1, value='inbox'):
diff --git a/src/mock/kivy_main.py b/src/mock/kivy_main.py
index 4f630109..765c69ea 100644
--- a/src/mock/kivy_main.py
+++ b/src/mock/kivy_main.py
@@ -31,9 +31,9 @@ def main():
     # close the main program even if there are threads left
     addressGeneratorThread.daemon = True
     addressGeneratorThread.start()
-
     state.kivyapp = NavigateApp()
     state.kivyapp.run()
+    addressGeneratorThread.stopThread()
 
 
 if __name__ == "__main__":