diff --git a/websocket/_handshake.py b/websocket/_handshake.py
index 95e9349..d8876e7 100644
--- a/websocket/_handshake.py
+++ b/websocket/_handshake.py
@@ -47,6 +47,7 @@ class handshake_response(object):
         self.headers = headers
         self.subprotocol = subprotocol
 
+
 def handshake(sock, hostname, port, resource, **options):
     headers, key = _get_handshake_headers(resource, hostname, port, options)
 
diff --git a/websocket/tests/test_websocket.py b/websocket/tests/test_websocket.py
index 6c7358d..6accaef 100644
--- a/websocket/tests/test_websocket.py
+++ b/websocket/tests/test_websocket.py
@@ -23,6 +23,12 @@ else:
 
 import uuid
 
+if six.PY3:
+    from base64 import decodebytes as base64decode
+else:
+    from base64 import decodestring as base64decode
+
+
 # websocket-client
 import websocket as ws
 from websocket._handshake import _create_sec_websocket_key
@@ -462,7 +468,7 @@ class WebSocketTest(unittest.TestCase):
         """ WebSocket key should be a UUID4.
         """
         key = _create_sec_websocket_key()
-        u = uuid.UUID(bytes=base64.b64decode(key))
+        u = uuid.UUID(bytes=base64decode(key.encode("utf-8")))
         self.assertEqual(4, u.version)