diff --git a/src/tests/core.py b/src/tests/core.py
index 172ae219..21cf7543 100644
--- a/src/tests/core.py
+++ b/src/tests/core.py
@@ -15,23 +15,23 @@ import threading
 import time
 import unittest
 
-import protocol
-import state
-import helper_sent
-import helper_addressbook
+from pybitmessage import (
+    helper_addressbook, helper_sent, protocol, state
+)
+from pybitmessage.bmconfigparser import BMConfigParser
+from pybitmessage.helper_msgcoding import MsgEncode, MsgDecode
+from pybitmessage.helper_sql import sqlQuery
+from pybitmessage.network import asyncore_pollchoose as asyncore, knownnodes
+from pybitmessage.network.bmproto import BMProto
+from pybitmessage.network.connectionpool import BMConnectionPool
+from pybitmessage.network.node import Node, Peer
+from pybitmessage.network.tcp import (
+    Socks4aBMConnection, Socks5BMConnection, TCPConnection
+)
+from pybitmessage.queues import excQueue
+from pybitmessage.version import softwareVersion
 
-from bmconfigparser import BMConfigParser
-from helper_msgcoding import MsgEncode, MsgDecode
-from helper_sql import sqlQuery
-from network import asyncore_pollchoose as asyncore, knownnodes
-from network.bmproto import BMProto
-from network.connectionpool import BMConnectionPool
-from network.node import Node, Peer
-from network.tcp import Socks4aBMConnection, Socks5BMConnection, TCPConnection
-from queues import excQueue
-from version import softwareVersion
-
-from common import cleanup
+from .common import cleanup
 
 try:
     socket.socket().bind(('127.0.0.1', 9050))
@@ -397,11 +397,11 @@ def run():
     loader.sortTestMethodsUsing = None
     suite = loader.loadTestsFromTestCase(TestCore)
     try:
-        import bitmessageqt.tests
+        from .bitmessageqt import tests
     except ImportError:
         pass
     else:
-        qt_tests = loader.loadTestsFromModule(bitmessageqt.tests)
+        qt_tests = loader.loadTestsFromModule(tests)
         suite.addTests(qt_tests)
 
     def keep_exc(ex_cls, exc, tb):  # pylint: disable=unused-argument