diff --git a/ironic/drivers/modules/agent_client.py b/ironic/drivers/modules/agent_client.py
index 2644fa46d2..ab1ffb51f0 100644
--- a/ironic/drivers/modules/agent_client.py
+++ b/ironic/drivers/modules/agent_client.py
@@ -45,7 +45,7 @@ class AgentClient(object):
             raise exception.IronicException(_('Agent driver requires '
                                               'agent_url in '
                                               'driver_internal_info'))
-        return ('%(agent_url)s/%(api_version)s/commands' %
+        return ('%(agent_url)s/%(api_version)s/commands/' %
                 {'agent_url': agent_url,
                  'api_version': CONF.agent.agent_api_version})
 
diff --git a/ironic/tests/unit/drivers/modules/test_agent_client.py b/ironic/tests/unit/drivers/modules/test_agent_client.py
index 790425e1e4..e9ff2d330c 100644
--- a/ironic/tests/unit/drivers/modules/test_agent_client.py
+++ b/ironic/tests/unit/drivers/modules/test_agent_client.py
@@ -70,7 +70,8 @@ class TestAgentClient(base.TestCase):
 
     def test__get_command_url(self):
         command_url = self.client._get_command_url(self.node)
-        expected = self.node.driver_internal_info['agent_url'] + '/v1/commands'
+        expected = ('%s/v1/commands/'
+                    % self.node.driver_internal_info['agent_url'])
         self.assertEqual(expected, command_url)
 
     def test__get_command_url_fail(self):