diff --git a/src/mock/kivy_main.py b/src/mock/kivy_main.py
index badc1dc1..7fe330f6 100644
--- a/src/mock/kivy_main.py
+++ b/src/mock/kivy_main.py
@@ -1,7 +1,11 @@
 """Mock kivy app with mock threads."""
+# pylint: disable=unused-import
+# flake8: noqa:E401
 
 from pybitmessage import state
 from pybitmessage.bitmessagekivy.mpybit import NavigateApp
+
+import multiqueue
 from class_addressGenerator import FakeAddressGenerator
 
 
diff --git a/src/mock/multiqueue.py b/src/mock/multiqueue.py
new file mode 100644
index 00000000..8ec76920
--- /dev/null
+++ b/src/mock/multiqueue.py
@@ -0,0 +1,7 @@
+"""
+Mock MultiQueue (just normal Queue)
+"""
+
+from six.moves import queue
+
+MultiQueue = queue.Queue
diff --git a/src/queues.py b/src/queues.py
index d86d36fa..4a9b98d2 100644
--- a/src/queues.py
+++ b/src/queues.py
@@ -8,13 +8,7 @@ from six.moves import queue
 try:
     from multiqueue import MultiQueue
 except ImportError:
-    try:
-        from .multiqueue import MultiQueue
-    except ImportError:
-        import sys
-        if 'bitmessagemock' not in sys.modules:
-            raise
-        MultiQueue = queue.Queue
+    from .multiqueue import MultiQueue
 
 
 class ObjectProcessorQueue(queue.Queue):