diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
index 35236a04..9feaa2ee 100755
--- a/src/bitmessagemain.py
+++ b/src/bitmessagemain.py
@@ -367,7 +367,15 @@ class Main:
                         time.time() - state.last_api_response >= 30):
                     self.stop()
         elif not state.enableGUI:
+            from tests import core
+            test_core_result = core.run()
+            state.enableGUI = True
             self.stop()
+            sys.exit(
+                'Core tests failed!'
+                if test_core_result.errors or test_core_result.failures
+                else 0
+            )
 
     def daemonize(self):
         grandfatherPid = os.getpid()
diff --git a/src/tests/core.py b/src/tests/core.py
new file mode 100644
index 00000000..63589da9
--- /dev/null
+++ b/src/tests/core.py
@@ -0,0 +1,12 @@
+import unittest
+
+
+class TestCore(unittest.TestCase):
+    """Test case, which runs from main pybitmessage thread"""
+    def test_pass(self):
+        pass
+
+
+def run():
+    suite = unittest.TestLoader().loadTestsFromTestCase(TestCore)
+    return unittest.TextTestRunner(verbosity=2).run(suite)