diff --git a/examples/pod_portforward.py b/examples/pod_portforward.py
index aa95ada3e7..9793fd3117 100644
--- a/examples/pod_portforward.py
+++ b/examples/pod_portforward.py
@@ -19,7 +19,8 @@
 import select
 import socket
 import time
-import urllib.request
+
+import six.moves.urllib.request as urllib_request
 
 from kubernetes import config
 from kubernetes.client import Configuration
@@ -179,11 +180,11 @@ def kubernetes_create_connection(address, *args, **kwargs):
 
     # Access the nginx http server using the
     # "<pod-name>.pod.<namespace>.kubernetes" dns name.
-    response = urllib.request.urlopen(
+    response = urllib_request.urlopen(
         'http://%s.pod.default.kubernetes' % name)
     html = response.read().decode('utf-8')
     response.close()
-    print('Status:', response.status)
+    print('Status Code: %s' % response.code)
     print(html)
 
 
diff --git a/kubernetes/base b/kubernetes/base
deleted file mode 160000
index 54d188f89e..0000000000
--- a/kubernetes/base
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 54d188f89e462e4c829aa9acb44d5c09cc5030ae
diff --git a/kubernetes/base b/kubernetes/base
new file mode 120000
index 0000000000..07b0aa3426
--- /dev/null
+++ b/kubernetes/base
@@ -0,0 +1 @@
+../../python-base
\ No newline at end of file
diff --git a/kubernetes/e2e_test/test_client.py b/kubernetes/e2e_test/test_client.py
index 95977b21b6..00e46a3776 100644
--- a/kubernetes/e2e_test/test_client.py
+++ b/kubernetes/e2e_test/test_client.py
@@ -17,7 +17,6 @@
 import socket
 import time
 import unittest
-import urllib.request
 import uuid
 
 from kubernetes.client import api_client
@@ -26,6 +25,7 @@
 from kubernetes.stream import stream, portforward
 from kubernetes.stream.ws_client import ERROR_CHANNEL
 
+import six.moves.urllib.request as urllib_request
 
 def short_uuid():
     id = str(uuid.uuid4())
@@ -228,7 +228,7 @@ def test_portforward_raw(self):
         self.assertTrue(pf.connected)
 
         sock = pf.socket(1236)
-        self.assertRaises(BrokenPipeError, sock.sendall, b'This should fail...')
+        self.assertRaises(socket.error, sock.sendall, b'This should fail...')
         self.assertIsNotNone(pf.error(1236))
         sock.close()
 
@@ -246,6 +246,7 @@ def test_portforward_raw(self):
                 reply += data
             self.assertEqual(reply, sent)
             sock.close()
+        time.sleep(1)
         self.assertFalse(pf.connected)
         self.assertIsNone(pf.error(1234))
         self.assertIsNone(pf.error(1235))
@@ -300,12 +301,12 @@ def kubernetes_create_connection(address, *args, **kwargs):
         socket_create_connection = socket.create_connection
         try:
             socket.create_connection = kubernetes_create_connection
-            response = urllib.request.urlopen('http://%s.default.kubernetes/' % name)
+            response = urllib_request.urlopen('http://%s.default.kubernetes/' % name)
             html = response.read().decode('utf-8')
         finally:
             socket.create_connection = socket_create_connection
 
-        self.assertEqual(response.status, 200)
+        self.assertEqual(response.code, 200)
         self.assertTrue('<h1>Welcome to nginx!</h1>' in html)
 
         resp = api.delete_namespaced_pod(name=name, body={},