diff --git a/test/test_rosmaster/test/client_verification/test_slave_api.py b/test/test_rosmaster/test/client_verification/test_slave_api.py
index 83551ea7c1..960cd3cd9a 100755
--- a/test/test_rosmaster/test/client_verification/test_slave_api.py
+++ b/test/test_rosmaster/test/client_verification/test_slave_api.py
@@ -47,7 +47,7 @@
 
 import rosunit
 import rosgraph
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 
 TCPROS = 'TCPROS'
 
@@ -127,7 +127,7 @@ def setUp(self):
             self.fail("master did not return XML-RPC API for [%s, %s]"%(self.caller_id, self.test_node))
         print "[%s] API  = %s"%(self.test_node, self.node_api)
         self.assert_(self.node_api.startswith('http'))
-        self.node = rosgraph.xmlrpc.ServerProxy(self.node_api)
+        self.node = ServerProxy(self.node_api)
 
         # hack: sleep for a couple seconds just in case the node is
         # still registering with the master.
diff --git a/test/test_rosmaster/test/master.py b/test/test_rosmaster/test/master.py
index 060b4c85bd..7df8d436c2 100644
--- a/test/test_rosmaster/test/master.py
+++ b/test/test_rosmaster/test/master.py
@@ -39,7 +39,7 @@
 
 import rospy
 import rosgraph
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 
 from rosclient import *
 
@@ -72,7 +72,7 @@ def setUp(self):
         super(_MasterTestCase, self).setUp()
         self.master_uri = os.environ.get(rosgraph.ROS_MASTER_URI, None)
         self._checkUri(self.master_uri)
-        self.master = rosgraph.xmlrpc.ServerProxy(self.master_uri)
+        self.master = ServerProxy(self.master_uri)
 
     ## validates a URI as being http(s)
     def _checkUri(self, uri):
diff --git a/test/test_rosmaster/test/node.py b/test/test_rosmaster/test/node.py
index 52954e3648..11998caa6a 100644
--- a/test/test_rosmaster/test/node.py
+++ b/test/test_rosmaster/test/node.py
@@ -39,7 +39,7 @@
 
 import rospy
 import rosgraph
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 
 from rosclient import *
 
@@ -111,7 +111,7 @@ def setUp(self):
             self.fail("master did not return XML-RPC API for [%s, %s]"%(self.caller_id, self.test_node))
         print("[%s] API  = %s" %(self.test_node, self.node_api))
         self.assert_(self.node_api.startswith('http'))
-        self.node = rosgraph.xmlrpc.ServerProxy(self.node_api)
+        self.node = ServerProxy(self.node_api)
 
     ## validates a URI as being http(s)
     def _checkUri(self, uri):
diff --git a/test/test_rosmaster/test/rosclient.py b/test/test_rosmaster/test/rosclient.py
index 56dc9aad11..0823852f42 100644
--- a/test/test_rosmaster/test/rosclient.py
+++ b/test/test_rosmaster/test/rosclient.py
@@ -36,7 +36,8 @@
 import unittest
 
 import rosgraph
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
+
 
 class TestRosClient(unittest.TestCase):
 
@@ -44,7 +45,7 @@ def setUp(self):
         self.last_code = None
         self.last_msg = None
         self.last_val = None
-        self.master = rosgraph.xmlrpc.ServerProxy(rosgraph.get_master_uri())
+        self.master = ServerProxy(rosgraph.get_master_uri())
     
     def tearDown(self):
         self.master = None
diff --git a/test/test_rosmaster/test/testMaster.py b/test/test_rosmaster/test/testMaster.py
index 293a7e63b1..31803a6e00 100644
--- a/test/test_rosmaster/test/testMaster.py
+++ b/test/test_rosmaster/test/testMaster.py
@@ -45,7 +45,7 @@
     from xmlrpclib import DateTime
 import unittest
 import rospy
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 from rostest import *
 from testSlave import msMain
 
@@ -76,7 +76,7 @@ def verifyNodeAddress(master, callerId, name, machine, addr, port):
         raddrinfo = socket.getaddrinfo(raddr, 0, 0, 0, socket.SOL_TCP)
         assert raddrinfo == addrinfo, "%s!=%s" % (raddrinfo, addrinfo)
     #ping the node
-    apiSuccess(rosgraph.xmlrpc.ServerProxy("http://%s:%s/"%(raddr, rport)).getPid(''))
+    apiSuccess(ServerProxy("http://%s:%s/"%(raddr, rport)).getPid(''))
 
 def testGraphState(master, graphNodes, graphFlows):
     graph = apiSuccess(master.getGraph(''))
@@ -573,7 +573,7 @@ def validate(val, callerId, name, port):
     def _verifyNodeDead(self, port):
         testUri = "http://localhost:%s/"%port
         try:
-            rosgraph.xmlrpc.ServerProxy(testUri).getPid('node')
+            ServerProxy(testUri).getPid('node')
             self.fail("test node is still running")
         except:
             pass
diff --git a/test/test_rosmaster/test/testSlave.py b/test/test_rosmaster/test/testSlave.py
index dd180bd14d..2203f48333 100644
--- a/test/test_rosmaster/test/testSlave.py
+++ b/test/test_rosmaster/test/testSlave.py
@@ -37,7 +37,7 @@
 import string
 
 import rospy
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 from rostest import *
 
 singletest = None
@@ -70,7 +70,7 @@ def setUp(self):
         self.caller_id = rospy.get_caller_id()
         self.node_api = self.apiSuccess(self.master.lookupNode(self.caller_id, 'test_node'))
         self.assert_(self.node_api.startswith('http'))
-        self.node = rosgraph.xmlrpc.ServerProxy(self.node_api)
+        self.node = ServerProxy(self.node_api)
         
     def testGetPid(self):
         pid = self.apiSuccess(self.node.getPid(self.caller_id))
@@ -104,7 +104,7 @@ def _subTestSourceRequestFlow(self, testName, protocols, testEval):
             port = apiSuccess(master.addNode('', '', sourceName, pkg, node, TEST_MACHINE, 0))
             apiSuccess(master.addNode('', '', sinkName, pkg, node, TEST_MACHINE, 0))
             sourceUri = 'http://%s:%s/'%(testNodeAddr[0], port)
-            sources[sourceName] = rosgraph.xmlrpc.ServerProxy(sourceUri)
+            sources[sourceName] = ServerProxy(sourceUri)
 
         for test in tests:
             sourceName, sinkName = [val%testName for val in test[0]]
@@ -183,7 +183,7 @@ def testSourceKillFlow(self):
             port = apiSuccess(master.addNode('', '', sourceName, pkg, node, TEST_MACHINE, 0))
             apiSuccess(master.addNode('', '', sinkName, pkg, node, TEST_MACHINE, 0))
             sourceUri = 'http://%s:%s/'%(testNodeAddr[0], port)
-            sources[sourceName] = rosgraph.xmlrpc.ServerProxy(sourceUri)
+            sources[sourceName] = ServerProxy(sourceUri)
             # - start the flow
             callerId, sourceLocator, sinkLocator = test[1]
             apiSuccess(master.connectFlow(callerId, sourceLocator, sinkLocator, 1))
@@ -254,7 +254,7 @@ def _sink_StartNodes(self, tests):
             sourceUri = 'http://%s:%s/'%(testNodeAddr[0], sourcePort)
             sinkUri = 'http://%s:%s/'%(testNodeAddr[0], sinkPort)
             sourceUris[sourceName] = sourceUri
-            sinks[sinkName] = rosgraph.xmlrpc.ServerProxy(sinkUri)
+            sinks[sinkName] = ServerProxy(sinkUri)
         return sourceUris, sinks
 
     def _sink_StartFlows(self, tests, sourceUris, sinks):
diff --git a/test/test_rospy/test/rostest/test_deregister.py b/test/test_rospy/test/rostest/test_deregister.py
index 2787c1ed08..5bd0c836f3 100755
--- a/test/test_rospy/test/rostest/test_deregister.py
+++ b/test/test_rospy/test/rostest/test_deregister.py
@@ -46,7 +46,7 @@
 
 import rospy
 import rostest
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 from std_msgs.msg import String
 from test_rospy.srv import EmptySrv
 
@@ -66,7 +66,7 @@ def callback(data):
 class TestDeregister(unittest.TestCase):
         
     def test_unpublish(self):
-        node_proxy = rosgraph.xmlrpc.ServerProxy(rospy.get_node_uri())
+        node_proxy = ServerProxy(rospy.get_node_uri())
         
         _, _, pubs = node_proxy.getPublications('/foo')
         pubs = [p for p in pubs if p[0] != '/rosout']
@@ -109,7 +109,7 @@ def test_unsubscribe(self):
         global _last_callback
 
         uri = rospy.get_node_uri()
-        node_proxy = rosgraph.xmlrpc.ServerProxy(uri)
+        node_proxy = ServerProxy(uri)
         _, _, subscriptions = node_proxy.getSubscriptions('/foo')
         self.assert_(not subscriptions, 'subscriptions present: %s'%str(subscriptions))
         
diff --git a/test/test_rospy/test/rostest/test_sub_to_multiple_pubs.py b/test/test_rospy/test/rostest/test_sub_to_multiple_pubs.py
index f9025dde08..9294bc6668 100755
--- a/test/test_rospy/test/rostest/test_sub_to_multiple_pubs.py
+++ b/test/test_rospy/test/rostest/test_sub_to_multiple_pubs.py
@@ -45,7 +45,7 @@
 import unittest
 
 import rosgraph
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 import rospy
 import rostest
 
@@ -81,7 +81,7 @@ def test_subscribe_to_multiple_publishers(self):
             self.assert_(False, 'cannot contact [%s]: unknown node' % LISTENER_NODE)
 
         socket.setdefaulttimeout(5.0)
-        node = rosgraph.xmlrpc.ServerProxy(node_api)
+        node = ServerProxy(node_api)
         code, _, businfo = node.getBusInfo(NAME)
         if code != 1:
             self.assert_(False, 'cannot get node information')
diff --git a/tools/rosgraph/src/rosgraph/impl/graph.py b/tools/rosgraph/src/rosgraph/impl/graph.py
index ea8113e78f..7989e04764 100644
--- a/tools/rosgraph/src/rosgraph/impl/graph.py
+++ b/tools/rosgraph/src/rosgraph/impl/graph.py
@@ -47,7 +47,7 @@
 import socket
 
 import rosgraph.masterapi
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 
 logger = logging.getLogger('rosgraph.graph')
 
@@ -452,7 +452,7 @@ def _node_refresh(self, node, bad_node=False):
         uri = self._node_uri_refresh(node)
         try:
             if uri:
-                api = rosgraph.xmlrpc.ServerProxy(uri)
+                api = ServerProxy(uri)
                 updated = self._node_refresh_businfo(node, api, bad_node)
         except KeyError as e:
             logger.warn('cannot contact node [%s] as it is not in the lookup table'%node)
diff --git a/tools/roslaunch/src/roslaunch/core.py b/tools/roslaunch/src/roslaunch/core.py
index 641484c3de..fd13a1febf 100644
--- a/tools/roslaunch/src/roslaunch/core.py
+++ b/tools/roslaunch/src/roslaunch/core.py
@@ -51,7 +51,7 @@
 import rosgraph
 import rosgraph.names 
 import rosgraph.network
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 
 from xml.sax.saxutils import escape 
 try:
@@ -291,7 +291,7 @@ def get(self):
         """
         :returns:: XMLRPC proxy for communicating with master, ``rosgraph.xmlrpc.ServerProxy``
         """
-        return rosgraph.xmlrpc.ServerProxy(self.uri)
+        return ServerProxy(self.uri)
     
     def get_multi(self):
         """
diff --git a/tools/roslaunch/src/roslaunch/netapi.py b/tools/roslaunch/src/roslaunch/netapi.py
index ed8540a172..d722405fed 100644
--- a/tools/roslaunch/src/roslaunch/netapi.py
+++ b/tools/roslaunch/src/roslaunch/netapi.py
@@ -38,7 +38,7 @@
 
 import rosgraph
 import rosgraph.network
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 
 _ID = '/roslaunch_netapi'
 def get_roslaunch_uris():
@@ -79,7 +79,7 @@ def list_processes(roslaunch_uris=None):
     procs = []
     for uri in roslaunch_uris:
         try:
-            r = rosgraph.xmlrpc.ServerProxy(uri)
+            r = ServerProxy(uri)
             code, msg, val = r.list_processes()
             if code == 1:
                 active, dead = val
diff --git a/tools/roslaunch/src/roslaunch/remoteprocess.py b/tools/roslaunch/src/roslaunch/remoteprocess.py
index 1a91b77487..f61b1ba578 100644
--- a/tools/roslaunch/src/roslaunch/remoteprocess.py
+++ b/tools/roslaunch/src/roslaunch/remoteprocess.py
@@ -41,7 +41,7 @@
 import traceback
 
 import rosgraph
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 from roslaunch.core import printlog, printerrlog
 import roslaunch.pmon
 import roslaunch.server
@@ -237,11 +237,10 @@ def start(self):
 
     def getapi(self):
         """
-        :returns: rosgraph.xmlrpc.ServerProxy to remote client XMLRPC server,
-                  `rosgraph.xmlrpc.ServerProxy`
+        :returns: ServerProxy to remote client XMLRPC server, `rosgraph.xmlrpc.ServerProxy`
         """
         if self.uri:
-            return rosgraph.xmlrpc.ServerProxy(self.uri)
+            return ServerProxy(self.uri)
         else:
             return None
     
diff --git a/tools/roslaunch/test/unit/test_roslaunch_core.py b/tools/roslaunch/test/unit/test_roslaunch_core.py
index 5e2fa82a70..bb6b540b25 100644
--- a/tools/roslaunch/test/unit/test_roslaunch_core.py
+++ b/tools/roslaunch/test/unit/test_roslaunch_core.py
@@ -38,7 +38,7 @@
 except ImportError:
     from xmlrpclib import MultiCall
 
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 import roslaunch.core
 
 def test_Executable():
@@ -246,7 +246,7 @@ def test_Master():
     m.get_host() == 'localhost'
     m.get_port() == 11311
     assert m.is_running() in [True, False]
-    assert isinstance(m.get(), rosgraph.xmlrpc.ServerProxy)
+    assert isinstance(m.get(), ServerProxy)
     assert isinstance(m.get_multi(), MultiCall)
     
     m = Master(uri='http://badhostname:11312')
diff --git a/tools/roslaunch/test/unit/test_roslaunch_server.py b/tools/roslaunch/test/unit/test_roslaunch_server.py
index 4de4f7ee39..24f55be8ee 100644
--- a/tools/roslaunch/test/unit/test_roslaunch_server.py
+++ b/tools/roslaunch/test/unit/test_roslaunch_server.py
@@ -35,9 +35,9 @@
 import unittest
 import time
 
+from rosgraph.xmlrpc import ServerProxy
 import roslaunch.pmon
 import roslaunch.server
-import rosgraph.xmlrpc
 from roslaunch.server import ProcessListener
 
 
@@ -347,7 +347,7 @@ def test_ROSLaunchNode(self):
         self.assert_(node.uri)
 
         # - call the ping API that we added
-        s = rosgraph.xmlrpc.ServerProxy(node.uri)
+        s = ServerProxy(node.uri)
         test_val = 'test-%s'%time.time()
         s.ping(test_val)
         self.assertEquals(handler.pinged, test_val)
@@ -404,7 +404,7 @@ def test_ROSLaunchParentNode(self):
         try:
             server.start()
             self.assert_(server.uri, "server URI did not initialize")
-            s = rosgraph.xmlrpc.ServerProxy(server.uri)
+            s = ServerProxy(server.uri)
             child_uri = 'http://fake-unroutable:1324'
             # - list children should be empty
             val = self._succeed(s.list_children())
@@ -455,7 +455,7 @@ def test_ROSLaunchChildNode(self):
         try:
             server.start()
             self.assert_(server.uri, "server URI did not initialize")
-            s = rosgraph.xmlrpc.ServerProxy(server.uri)
+            s = ServerProxy(server.uri)
 
             print("SERVER STARTED")
             
diff --git a/utilities/roswtf/src/roswtf/graph.py b/utilities/roswtf/src/roswtf/graph.py
index 5ab74c9324..d83487cdf1 100644
--- a/utilities/roswtf/src/roswtf/graph.py
+++ b/utilities/roswtf/src/roswtf/graph.py
@@ -46,7 +46,7 @@
 import rosgraph
 import rosgraph.rosenv
 import rosgraph.network
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 
 import rosnode
 import rosservice
@@ -288,7 +288,7 @@ def run(self):
                     ctx.errors.append(WtfError("Master does not have lookup information for node [%s]"%n))
                 return
                 
-            node = rosgraph.xmlrpc.ServerProxy(node_api)
+            node = ServerProxy(node_api)
             start = time.time()
             socket.setdefaulttimeout(3.0)            
             code, msg, bus_info = node.getBusInfo('/roswtf')
diff --git a/utilities/roswtf/src/roswtf/roslaunchwtf.py b/utilities/roswtf/src/roswtf/roslaunchwtf.py
index 8c067a8b23..3f3e92e854 100644
--- a/utilities/roswtf/src/roswtf/roslaunchwtf.py
+++ b/utilities/roswtf/src/roswtf/roslaunchwtf.py
@@ -40,7 +40,7 @@
 
 from os.path import isfile, isdir
 
-import rosgraph.xmlrpc
+from rosgraph.xmlrpc import ServerProxy
 import roslib.packages
 import roslaunch
 import roslaunch.netapi
@@ -198,7 +198,7 @@ def roslaunch_respawn_check(ctx):
     respawn = []
     for uri in ctx.roslaunch_uris:
         try:
-            r = rosgraph.xmlrpc.ServerProxy(uri)
+            r = ServerProxy(uri)
             code, msg, val = r.list_processes()
             active, _ = val
             respawn.extend([a for a in active if a[1] > 1])
@@ -214,13 +214,13 @@ def roslaunch_uris_check(ctx):
     # uris only contains the parent launches
     for uri in ctx.roslaunch_uris:
         try:
-            r = rosgraph.xmlrpc.ServerProxy(uri)
+            r = ServerProxy(uri)
             code, msg, val = r.list_children()
             # check the children launches
             if code == 1:
                 for child_uri in val:
                     try:
-                        r = rosgraph.xmlrpc.ServerProxy(uri)
+                        r = ServerProxy(uri)
                         code, msg, val = r.get_pid()
                     except:
                         bad.append(child_uri)
@@ -232,7 +232,7 @@ def roslaunch_dead_check(ctx):
     dead = []
     for uri in ctx.roslaunch_uris:
         try:
-            r = rosgraph.xmlrpc.ServerProxy(uri)
+            r = ServerProxy(uri)
             code, msg, val = r.list_processes()
             _, dead_list = val
             dead.extend([d[0] for d in dead_list])