diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
index f380d6e2..70820dbf 100755
--- a/src/bitmessagemain.py
+++ b/src/bitmessagemain.py
@@ -325,7 +325,7 @@ class Main:
             upnpThread = upnp.uPnPThread()
             upnpThread.start()
 
-        if daemon == False and BMConfigParser().safeGetBoolean('bitmessagesettings', 'daemon') == False:
+        if daemon == False and BMConfigParser().safeGetBoolean('bitmessagesettings', 'daemon') == False and not state.testmode:
             if state.curses == False:
                 if not depends.check_pyqt():
                     print('PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download PyQt from http://www.riverbankcomputing.com/software/pyqt/download   or by searching Google for \'PyQt Download\'. If you want to run in daemon mode, see https://bitmessage.org/wiki/Daemon')
@@ -334,18 +334,22 @@ class Main:
 
                 import bitmessageqt
                 bitmessageqt.run()
+            
             else:
                 if True:
 #                if depends.check_curses():
                     print('Running with curses')
                     import bitmessagecurses
                     bitmessagecurses.runwrapper()
+        elif state.testmode:
+            sleep(10)
+            self.stop()
         else:
             BMConfigParser().remove_option('bitmessagesettings', 'dontconnect')
 
-        if state.testmode:
-            sleep(10)
-            self.stop()
+        # if state.testmode:
+        #     sleep(10)
+        #     self.stop()
         if daemon or state.testmode:
             while state.shutdown == 0:
                 sleep(1)