diff --git a/keystoneclient/tests/v2_0/test_shell.py b/keystoneclient/tests/v2_0/test_shell.py
index 1b6db200b..9eae6e111 100644
--- a/keystoneclient/tests/v2_0/test_shell.py
+++ b/keystoneclient/tests/v2_0/test_shell.py
@@ -332,7 +332,8 @@ class ShellTests(utils.TestCase):
                  'password': 'newpass'}})
 
     def test_endpoint_create(self):
-        self.run_command('endpoint-create --service-id 1')
+        self.run_command('endpoint-create --service-id 1 '
+                         '--publicurl=http://example.com:1234/go')
         self.fake_client.assert_called_anytime(
             'POST', '/endpoints',
             {'endpoint':
@@ -340,7 +341,7 @@ class ShellTests(utils.TestCase):
                  'service_id': '1',
                  'region': 'regionOne',
                  'internalurl': None,
-                 'publicurl': None}})
+                 'publicurl': "http://example.com:1234/go"}})
 
     def test_endpoint_list(self):
         self.run_command('endpoint-list')
diff --git a/keystoneclient/v2_0/shell.py b/keystoneclient/v2_0/shell.py
index d241571fe..cd315fb15 100644
--- a/keystoneclient/v2_0/shell.py
+++ b/keystoneclient/v2_0/shell.py
@@ -490,7 +490,7 @@ def do_endpoint_list(kc, args):
 @utils.arg('--service', '--service-id', '--service_id',
            metavar='<service>', required=True,
            help='Name or ID of service associated with Endpoint')
-@utils.arg('--publicurl', metavar='<public-url>',
+@utils.arg('--publicurl', metavar='<public-url>', required=True,
            help='Public URL endpoint')
 @utils.arg('--adminurl', metavar='<admin-url>',
            help='Admin URL endpoint')