diff --git a/XSConsoleMetrics.py b/XSConsoleMetrics.py
index 4fb430e..8cf4d8a 100644
--- a/XSConsoleMetrics.py
+++ b/XSConsoleMetrics.py
@@ -14,7 +14,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import XenAPI
-import urllib
+import urllib.request, urllib.parse, urllib.error
 import xml.dom.minidom
 
 from XSConsoleAuth import *
@@ -138,7 +138,7 @@ def FetchData(self):
 
             httpRequest = 'http://localhost/rrd_updates?session_id=%s&start=%s&host=true' % (sessionID, int(time.time()) - self.SNAPSHOT_SECS)
 
-            socket = urllib.URLopener().open(httpRequest)
+            socket = urllib.request.URLopener().open(httpRequest)
             try:
                 content = socket.read()
             finally:
diff --git a/XSConsoleRemoteTest.py b/XSConsoleRemoteTest.py
index b506bf2..0e92455 100644
--- a/XSConsoleRemoteTest.py
+++ b/XSConsoleRemoteTest.py
@@ -13,7 +13,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import os, socket, xmlrpclib
+import os, socket, xmlrpc.client
 
 from XSConsoleBases import *
 from XSConsoleImporter import *
@@ -21,19 +21,19 @@
 from XSConsoleLog import *
 from XSConsoleLayout import *
 
-import SocketServer
-import SimpleXMLRPCServer
+import socketserver
+import xmlrpc.server
 
-class UnixSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
-    # Python 2.7's SimpleXMLRPCRequestHandler enables Nagle's algorithm by default
+class UnixSimpleXMLRPCRequestHandler(xmlrpc.server.SimpleXMLRPCRequestHandler):
+    # SimpleXMLRPCRequestHandler enables Nagle's algorithm by default
     # which fails because we're working with Unix domain sockets so disable it.
     disable_nagle_algorithm = False
 
-class UDSXMLRPCServer(SocketServer.UnixStreamServer, SimpleXMLRPCServer.SimpleXMLRPCDispatcher):
+class UDSXMLRPCServer(socketserver.UnixStreamServer, xmlrpc.server.SimpleXMLRPCDispatcher):
     def __init__(self, inAddr, inRequestHandler = None):
         self.logRequests = False
-        SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self)
-        SocketServer.UnixStreamServer.__init__(self, inAddr,
+        xmlrpc.server.SimpleXMLRPCDispatcher.__init__(self)
+        socketserver.UnixStreamServer.__init__(self, inAddr,
             FirstValue(inRequestHandler, UnixSimpleXMLRPCRequestHandler))
 
     def handle_request(self):
@@ -122,14 +122,14 @@ def WrapProcedure(self, inProc): # Any return value of inProc is discarded
         try:
             inProc()
         except Exception as e:
-            raise xmlrpclib.Fault(1, self.ErrorString(e))
+            raise xmlrpc.client.Fault(1, self.ErrorString(e))
         return None
 
     def WrapFunction(self, inFunc): # inFunc returns a value
         try:
             retVal = inFunc()
         except Exception as e:
-            raise xmlrpclib.Fault(1, self.ErrorString(e))
+            raise xmlrpc.client.Fault(1, self.ErrorString(e))
         return retVal
 
     def StandardReturn(self, inInfix = None):
@@ -193,7 +193,7 @@ def HandleXMLRPCVerify(self, inString):
                 result = line
                 break
         if result is None:
-            raise xmlrpclib.Fault(1, self.ErrorString()+"\n\nSearch string '"+inString+"' not found.")
+            raise xmlrpc.client.Fault(1, self.ErrorString()+"\n\nSearch string '"+inString+"' not found.")
         return self.StandardReturn("found '"+result+"'")
 
     def HandleXMLRPCActivate(self, inName):
@@ -250,7 +250,7 @@ def HandleXMLRPCAssertFailure(self):
         """
         self.params = ['assertfailure']
         if len(self.errors) == 0:
-            raise xmlrpclib.Fault(1, self.ErrorString())
+            raise xmlrpc.client.Fault(1, self.ErrorString())
         return self.StandardReturn()
 
     def HandleXMLRPCAssertSuccess(self):
@@ -261,7 +261,7 @@ def HandleXMLRPCAssertSuccess(self):
         """
         self.params = ['assertsuccess']
         if len(self.errors) > 0:
-            raise xmlrpclib.Fault(1, self.ErrorString())
+            raise xmlrpc.client.Fault(1, self.ErrorString())
         return self.StandardReturn()
 
 class NullRemoteTest: