diff --git a/openstackclient/common/command.py b/openstackclient/common/command.py
index 9abaae0b8..29c1534d6 100644
--- a/openstackclient/common/command.py
+++ b/openstackclient/common/command.py
@@ -17,10 +17,10 @@
 
 import sys
 
-from osc_lib.command import *  # noqa
+from osc_lib.command.command import *  # noqa
 
 
 sys.stderr.write(
     "WARNING: %s is deprecated and will be removed after Jun 2017. "
-    "Please use osc_lib.command\n" % __name__
+    "Please use osc_lib.command.command\n" % __name__
 )
diff --git a/openstackclient/tests/common/test_command.py b/openstackclient/tests/common/test_command.py
index a8bcf6a81..658bc895c 100644
--- a/openstackclient/tests/common/test_command.py
+++ b/openstackclient/tests/common/test_command.py
@@ -14,9 +14,9 @@
 
 import mock
 
-from osc_lib.command import command
 from osc_lib import exceptions
 
+from openstackclient.common import command
 from openstackclient.tests import fakes as test_fakes
 from openstackclient.tests import utils as test_utils