diff --git a/docker/client.py b/docker/client.py
index 8bf74cd4..47cd497f 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -564,7 +564,8 @@ class Client(requests.Session):
             }
 
         # create the command
-        res = self._post_json(self._url('/containers/shell/exec'), data=data)
+        url = self._url('/containers/{0}/exec'.format(container))
+        res = self._post_json(url, data=data)
         self._raise_for_status(res)
 
         # start the command
diff --git a/tests/fake_api.py b/tests/fake_api.py
index 7428f3d5..252ea6bf 100644
--- a/tests/fake_api.py
+++ b/tests/fake_api.py
@@ -344,7 +344,7 @@ fake_responses = {
     get_fake_diff,
     '{1}/{0}/containers/3cc2351ab11b/export'.format(CURRENT_VERSION, prefix):
     get_fake_export,
-    '{1}/{0}/containers/shell/exec'.format(CURRENT_VERSION, prefix):
+    '{1}/{0}/containers/3cc2351ab11b/exec'.format(CURRENT_VERSION, prefix):
     post_fake_execute,
     '{1}/{0}/exec/3cc2351ab11b/start'.format(CURRENT_VERSION, prefix):
     post_fake_execute_start,