@@ -165,13 +165,12 @@ def get_parser(self, prog_name):
             '--enable',
             dest='enabled',
             action='store_true',
-            default=True,
             help='Enable endpoint',
         )
         enable_group.add_argument(
             '--disable',
-            dest='enabled',
-            action='store_false',
+            dest='disabled',
+            action='store_true',
             help='Disable endpoint',
         )
         return parser
@@ -183,7 +182,8 @@ def take_action(self, parsed_args):
                                        parsed_args.endpoint)
 
         if (not parsed_args.interface and not parsed_args.url
-                and not parsed_args.service and not parsed_args.region):
+                and not parsed_args.service and not parsed_args.region
+                and not parsed_args.enabled and not parsed_args.disabled):
             sys.stdout.write("Endpoint not updated, no arguments present")
             return
 
@@ -192,13 +192,19 @@ def take_action(self, parsed_args):
             service = common.find_service(identity_client, parsed_args.service)
             service_id = service.id
 
+        enabled = None
+        if parsed_args.enabled:
+            enabled = True
+        if parsed_args.disabled:
+            enabled = False
+
         identity_client.endpoints.update(
             endpoint.id,
             service=service_id,
             url=parsed_args.url,
             interface=parsed_args.interface,
             region=parsed_args.region,
-            enabled=parsed_args.enabled
+            enabled=enabled
         )
 
         return
 
@@ -74,6 +74,20 @@
     'enabled': True,
 }
 
+endpoint_id = 'e-123'
+endpoint_url = 'http://127.0.0.1:35357'
+endpoint_region = 'RegionOne'
+endpoint_interface = 'admin'
+
+ENDPOINT = {
+    'id': endpoint_id,
+    'url': endpoint_url,
+    'region': endpoint_region,
+    'interface': endpoint_interface,
+    'service_id': service_id,
+    'enabled': True,
+}
+
 user_id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
 user_name = 'paul'
 user_description = 'Sir Paul'
@@ -182,6 +196,8 @@ class FakeIdentityv3Client(object):
     def __init__(self, **kwargs):
         self.domains = mock.Mock()
         self.domains.resource_class = fakes.FakeResource(None, {})
+        self.endpoints = mock.Mock()
+        self.endpoints.resource_class = fakes.FakeResource(None, {})
         self.groups = mock.Mock()
         self.groups.resource_class = fakes.FakeResource(None, {})
         self.oauth1 = mock.Mock()