diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py
index d15d60d2937a82..3358fba034387e 100644
--- a/Lib/xmlrpc/client.py
+++ b/Lib/xmlrpc/client.py
@@ -1426,6 +1426,8 @@ def __init__(self, uri, transport=None, encoding=None, verbose=False,
             raise OSError("unsupported XML-RPC protocol")
         self.__host = p.netloc
         self.__handler = p.path or "/RPC2"
+        if p.query:
+            self.__handler += "?" + p.query
 
         if transport is None:
             if p.scheme == "https":