diff --git a/requirements.txt b/requirements.txt
index 7cc8009..11345b5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,6 @@
 
 Babel>=2.3.4 # BSD
 pbr>=1.6 # Apache-2.0
-cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
 osc-lib>=0.1.0 # Apache-2.0
 PrettyTable<0.8,>=0.7 # BSD
 oslo.i18n>=2.1.0 # Apache-2.0
diff --git a/searchlightclient/osc/v1/facet.py b/searchlightclient/osc/v1/facet.py
index 13827a4..1755cca 100644
--- a/searchlightclient/osc/v1/facet.py
+++ b/searchlightclient/osc/v1/facet.py
@@ -16,11 +16,11 @@
 import logging
 import six
 
-from cliff import lister
+from osc_lib.command import command
 from osc_lib import utils
 
 
-class ListFacet(lister.Lister):
+class ListFacet(command.Lister):
     """List Searchlight Facet."""
 
     log = logging.getLogger(__name__ + ".ListFacet")
diff --git a/searchlightclient/osc/v1/resource_type.py b/searchlightclient/osc/v1/resource_type.py
index 0ed4d1b..f110406 100644
--- a/searchlightclient/osc/v1/resource_type.py
+++ b/searchlightclient/osc/v1/resource_type.py
@@ -15,11 +15,11 @@
 
 import logging
 
-from cliff import lister
+from osc_lib.command import command
 from osc_lib import utils
 
 
-class ListResourceType(lister.Lister):
+class ListResourceType(command.Lister):
     """List Searchlight Resource Type (Plugin)."""
 
     log = logging.getLogger(__name__ + ".ListResourceType")
diff --git a/searchlightclient/osc/v1/search.py b/searchlightclient/osc/v1/search.py
index 27aeb5c..ba20286 100644
--- a/searchlightclient/osc/v1/search.py
+++ b/searchlightclient/osc/v1/search.py
@@ -17,11 +17,11 @@ import json
 import logging
 import six
 
-from cliff import lister
+from osc_lib.command import command
 from osc_lib import utils
 
 
-class SearchResource(lister.Lister):
+class SearchResource(command.Lister):
     """Search Searchlight resource."""
 
     log = logging.getLogger(__name__ + ".SearchResource")
diff --git a/searchlightclient/tests/unit/osc/utils.py b/searchlightclient/tests/unit/osc/utils.py
index 0c669bf..6c3c6b4 100644
--- a/searchlightclient/tests/unit/osc/utils.py
+++ b/searchlightclient/tests/unit/osc/utils.py
@@ -70,7 +70,7 @@ class TestCase(testtools.TestCase):
 
 
 class TestCommand(TestCase):
-    """Test cliff command classes"""
+    """Test osc_lib command classes"""
 
     def setUp(self):
         super(TestCommand, self).setUp()