diff --git a/cinderclient/tests/functional/test_readonly_cli.py b/cinderclient/tests/functional/test_readonly_cli.py
index 3483aa499..87578a0b5 100644
--- a/cinderclient/tests/functional/test_readonly_cli.py
+++ b/cinderclient/tests/functional/test_readonly_cli.py
@@ -47,14 +47,6 @@ class CinderClientReadOnlyTests(base.ClientTestBase):
                                                'Cipher', 'Key Size',
                                                'Control Location'])
 
-    def test_endpoints(self):
-        out = self.cinder('endpoints')
-        tables = self.parser.tables(out)
-        for table in tables:
-            headers = table['headers']
-            self.assertGreaterEqual(2, len(headers))
-            self.assertEqual('Value', headers[1])
-
     def test_extra_specs_list(self):
         extra_specs_list = self.cinder('extra-specs-list')
         self.assertTableHeaders(extra_specs_list, ['ID', 'Name',
diff --git a/cinderclient/v2/shell.py b/cinderclient/v2/shell.py
index 0c77f831a..fb87a4fa8 100644
--- a/cinderclient/v2/shell.py
+++ b/cinderclient/v2/shell.py
@@ -20,7 +20,6 @@ import argparse
 import collections
 import copy
 import os
-import warnings
 
 from oslo_utils import strutils
 import six
@@ -923,24 +922,6 @@ def do_type_access_remove(cs, args):
         vtype, args.project_id)
 
 
-def do_endpoints(cs, args):
-    """Discovers endpoints registered by authentication service."""
-    warnings.warn(
-        "``cinder endpoints`` is deprecated, use ``openstack catalog list`` "
-        "instead. The ``cinder endpoints`` command may be removed in the P "
-        "release or next major release of cinderclient (v2.0.0 or greater).")
-    catalog = cs.client.service_catalog.catalog
-    for e in catalog:
-        utils.print_dict(e['endpoints'][0], e['name'])
-
-
-def do_credentials(cs, args):
-    """Shows user credentials returned from auth."""
-    warnings.warn(
-        "``cinder credentials`` is deprecated, use ``openstack token issue`` "
-        "indead.")
-
-
 @utils.arg('tenant',
            metavar='<tenant_id>',
            help='ID of tenant for which to list quotas.')
diff --git a/releasenotes/notes/cinderclient-5-de0508ce5a221d21.yaml b/releasenotes/notes/cinderclient-5-de0508ce5a221d21.yaml
index 3cf32c695..588dfdd1b 100644
--- a/releasenotes/notes/cinderclient-5-de0508ce5a221d21.yaml
+++ b/releasenotes/notes/cinderclient-5-de0508ce5a221d21.yaml
@@ -10,3 +10,9 @@ upgrade:
     This version of the python-cinderclient no longer supports the Cinder v1
     API. Ensure all mananaged services have at least the v2 API available prior
     to upgrading this client.
+  - |
+    The ``cinder endpoints`` command was deprecated and has now been removed.
+    The command ``openstack catalog list`` should be used instead.
+  - |
+    The ``cinder credentials`` command was deprecated and has now been removed.
+    The command ``openstack token issue`` should be used instead.