diff --git a/docker/client.py b/docker/client.py
index 9012d24c9..979fcacd7 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -90,11 +90,13 @@ def from_env(cls, **kwargs):
         timeout = kwargs.pop('timeout', DEFAULT_TIMEOUT_SECONDS)
         max_pool_size = kwargs.pop('max_pool_size', DEFAULT_MAX_POOL_SIZE)
         version = kwargs.pop('version', None)
+        credstore_env = kwargs.pop('credstore_env', None)
         use_ssh_client = kwargs.pop('use_ssh_client', False)
         return cls(
             timeout=timeout,
             max_pool_size=max_pool_size,
             version=version,
+            credstore_env=credstore_env,
             use_ssh_client=use_ssh_client,
             **kwargs_from_env(**kwargs)
         )