diff --git a/terminatorlib/debugserver.py b/terminatorlib/debugserver.py
index b0c4b2ec..731dd377 100644
--- a/terminatorlib/debugserver.py
+++ b/terminatorlib/debugserver.py
@@ -8,9 +8,12 @@ from terminatorlib.version import APP_NAME, APP_VERSION
 
 import socket
 import threading
-import socketserver
-import code
 import sys
+if sys.version_info < (3, 0):
+  import SocketServer as socketserver
+else:
+  import socketserver
+import code
 import readline
 import rlcompleter
 import re
diff --git a/tests/test_signalman.py b/tests/test_signalman.py
index 0877dfb6..0044e11d 100755
--- a/tests/test_signalman.py
+++ b/tests/test_signalman.py
@@ -7,24 +7,24 @@
 >>> signalman = Signalman()
 >>> signalman.new(widget, 'test1', handler)
 1
->>> signalman.cnxids[widget].keys()
-dict_keys(['test1'])
->>> widget.signals.values()
-dict_values(['test1'])
+>>> list(signalman.cnxids[widget].keys())
+['test1']
+>>> list(widget.signals.values())
+['test1']
 >>> signalman.remove_widget(widget)
 >>> widget in signalman.cnxids
 False
->>> widget.signals.values()
-dict_values([])
+>>> list(widget.signals.values())
+[]
 >>> signalman.new(widget, 'test2', handler)
 2
 >>> signalman.new(widget, 'test3', handler)
 3
 >>> signalman.remove_signal(widget, 'test2')
->>> signalman.cnxids[widget].keys()
-dict_keys(['test3'])
->>> widget.signals.values()
-dict_values(['test3'])
+>>> list(signalman.cnxids[widget].keys())
+['test3']
+>>> list(widget.signals.values())
+['test3']
 >>> signalman.remove_widget(widget)
 >>>