5 files changed, 8 insertions, 7 deletions
diff --git a/test/test_console_common.py b/test/test_console_common.py
index 459539c5..3e176d75 100644
--- a/test/test_console_common.py
+++ b/test/test_console_common.py
@@ -1,5 +1,5 @@
 import os
-from nose.plugins.skip import SkipTest
+from unittest.case import SkipTest
 if os.name == "nt":
     raise SkipTest("Skipped on Windows.")
 
diff --git a/test/test_console_help.py b/test/test_console_help.py
index a7a8b745..dc2591e5 100644
--- a/test/test_console_help.py
+++ b/test/test_console_help.py
@@ -1,5 +1,5 @@
 import os
-from nose.plugins.skip import SkipTest
+from unittest.case import SkipTest
 if os.name == "nt":
     raise SkipTest("Skipped on Windows.")
 
diff --git a/test/test_console_palettes.py b/test/test_console_palettes.py
index a3b7fe4f..9cf5d95c 100644
--- a/test/test_console_palettes.py
+++ b/test/test_console_palettes.py
@@ -1,5 +1,5 @@
 import os
-from nose.plugins.skip import SkipTest
+from unittest.case import SkipTest
 if os.name == "nt":
     raise SkipTest("Skipped on Windows.")
 import libmproxy.console.palettes as palettes
diff --git a/test/test_server.py b/test/test_server.py
index c81a2843..5f644c96 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -124,6 +124,8 @@ class TcpMixin:
         i2 = self.pathod("306")
         self._ignore_off()
 
+        self.master.masterq.join()
+
         assert n.status_code == 304
         assert i.status_code == 305
         assert i2.status_code == 306
@@ -168,6 +170,8 @@ class TcpMixin:
         i2 = self.pathod("306")
         self._tcpproxy_off()
 
+        self.master.masterq.join()
+
         assert n.status_code == 304
         assert i.status_code == 305
         assert i2.status_code == 306
diff --git a/test/tutils.py b/test/tutils.py
index f1db7842..cc8c407f 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -6,16 +6,13 @@ import sys
 from cStringIO import StringIO
 from contextlib import contextmanager
 
-from nose.plugins.skip import SkipTest
-from mock import Mock
+from unittest.case import SkipTest
 
 import netlib.tutils
 from libmproxy import utils, controller
 from libmproxy.models import (
     ClientConnection, ServerConnection, Error, HTTPRequest, HTTPResponse, HTTPFlow
 )
-from libmproxy.console.flowview import FlowView
-from libmproxy.console import ConsoleState
 
 
 def _SkipWindows(*args):