diff --git a/ckanext/datapusher/cli.py b/ckanext/datapusher/cli.py
index b8083d96abb..2af30319c04 100644
--- a/ckanext/datapusher/cli.py
+++ b/ckanext/datapusher/cli.py
@@ -1,4 +1,4 @@
-import ckan.lib.cli as cli
+import ckan.lib.commands as cli
 import ckan.plugins as p
 import ckanext.datastore.db as datastore_db
 
diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 4e36a24602d..83ab98a3998 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -15,7 +15,7 @@
 from sqlalchemy.exc import (ProgrammingError, IntegrityError,
                             DBAPIError, DataError)
 import psycopg2.extras
-import ckan.lib.cli as cli
+import ckan.lib.commands as cli
 import ckan.plugins as p
 import ckan.plugins.toolkit as toolkit
 import ckanext.datastore.interfaces as interfaces
diff --git a/ckanext/datastore/tests/helpers.py b/ckanext/datastore/tests/helpers.py
index 3ee89cdda20..5c22e2395fe 100644
--- a/ckanext/datastore/tests/helpers.py
+++ b/ckanext/datastore/tests/helpers.py
@@ -1,5 +1,5 @@
 import ckan.model as model
-import ckan.lib.cli as cli
+import ckan.lib.commands as cli
 
 import ckan.plugins as p