diff --git a/redis/client.py b/redis/client.py
index 514db536ed..6dee3868ad 100755
--- a/redis/client.py
+++ b/redis/client.py
@@ -1255,7 +1255,7 @@ def client_info(self):
         """
         return self.execute_command('CLIENT INFO')
 
-    def client_list(self, _type=None):
+    def client_list(self, _type=None, client_id=None):
         """
         Returns a list of currently connected clients.
         If type of client specified, only that type will be returned.
@@ -1263,13 +1263,18 @@ def client_list(self, _type=None):
          replica, pubsub)
         """
         "Returns a list of currently connected clients"
+        args = []
         if _type is not None:
             client_types = ('normal', 'master', 'replica', 'pubsub')
             if str(_type).lower() not in client_types:
                 raise DataError("CLIENT LIST _type must be one of %r" % (
                                 client_types,))
-            return self.execute_command('CLIENT LIST', b'TYPE', _type)
-        return self.execute_command('CLIENT LIST')
+            args.append(b'TYPE')
+            args.append(_type)
+        if client_id is not None:
+            args.append(b"ID")
+            args.append(client_id)
+        return self.execute_command('CLIENT LIST', *args)
 
     def client_getname(self):
         "Returns the current connection name"
@@ -2913,9 +2918,7 @@ def zadd(self, name, mapping, nx=False, xx=False, ch=False, incr=False,
             raise DataError("ZADD option 'incr' only works when passing a "
                             "single element/score pair")
         if nx is True and (gt is not None or lt is not None):
-            raise DataError("Only one of 'nx', 'lt', or 'gt' may be defined.")
-        if gt is not None and lt is not None:
-            raise DataError("Only one of 'gt' or 'lt' can be set.")
+            raise DataError("Only one of 'nx', 'lt', or 'gr' may be defined.")
 
         pieces = []
         options = {}
diff --git a/tests/test_commands.py b/tests/test_commands.py
index 40c813d7a1..fe1f0064c2 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -295,6 +295,14 @@ def test_client_list_type(self, r):
             clients = r.client_list(_type=client_type)
             assert isinstance(clients, list)
 
+    @skip_if_server_version_lt('6.2.0')
+    def test_client_list_client_id(self, r):
+        clients = r.client_list()
+        client_id = clients[0]['id']
+        clients = r.client_list(client_id=client_id)
+        assert len(clients) == 1
+        assert 'addr' in clients[0]
+
     @skip_if_server_version_lt('5.0.0')
     def test_client_id(self, r):
         assert r.client_id() > 0