diff --git a/heatclient/common/http.py b/heatclient/common/http.py
index c7993c12..03d040a9 100644
--- a/heatclient/common/http.py
+++ b/heatclient/common/http.py
@@ -19,14 +19,13 @@ import logging
 import os
 import socket
 
+from oslo_serialization import jsonutils
+from oslo_utils import encodeutils
+from oslo_utils import importutils
 import requests
 import six
 from six.moves.urllib import parse
 
-from oslo.serialization import jsonutils
-from oslo.utils import encodeutils
-from oslo.utils import importutils
-
 from heatclient import exc
 from heatclient.openstack.common._i18n import _
 from heatclient.openstack.common._i18n import _LE
diff --git a/heatclient/common/template_utils.py b/heatclient/common/template_utils.py
index 29dd3fc7..5b87b1f4 100644
--- a/heatclient/common/template_utils.py
+++ b/heatclient/common/template_utils.py
@@ -16,13 +16,13 @@
 import base64
 import collections
 import os
+
+from oslo_serialization import jsonutils
 import six
 from six.moves.urllib import error
 from six.moves.urllib import parse
 from six.moves.urllib import request
 
-from oslo.serialization import jsonutils
-
 from heatclient.common import environment_format
 from heatclient.common import template_format
 from heatclient import exc
diff --git a/heatclient/common/utils.py b/heatclient/common/utils.py
index 3ffb35a0..28c0ca15 100644
--- a/heatclient/common/utils.py
+++ b/heatclient/common/utils.py
@@ -14,15 +14,15 @@
 #    under the License.
 from __future__ import print_function
 
-import prettytable
-from six.moves.urllib import parse
 import sys
 import textwrap
 import uuid
-import yaml
 
-from oslo.serialization import jsonutils
-from oslo.utils import importutils
+from oslo_serialization import jsonutils
+from oslo_utils import importutils
+import prettytable
+from six.moves.urllib import parse
+import yaml
 
 from heatclient import exc
 from heatclient.openstack.common._i18n import _
diff --git a/heatclient/exc.py b/heatclient/exc.py
index 4240d75a..7168d79f 100644
--- a/heatclient/exc.py
+++ b/heatclient/exc.py
@@ -12,7 +12,7 @@
 
 import sys
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from heatclient.openstack.common._i18n import _
 
diff --git a/heatclient/shell.py b/heatclient/shell.py
index 007818df..b3a3db7d 100644
--- a/heatclient/shell.py
+++ b/heatclient/shell.py
@@ -20,12 +20,11 @@ import argparse
 import logging
 import sys
 
+from oslo_utils import encodeutils
+from oslo_utils import importutils
 import six
 import six.moves.urllib.parse as urlparse
 
-from oslo.utils import encodeutils
-from oslo.utils import importutils
-
 from keystoneclient.auth.identity import v2 as v2_auth
 from keystoneclient.auth.identity import v3 as v3_auth
 from keystoneclient import discover
diff --git a/heatclient/tests/fakes.py b/heatclient/tests/fakes.py
index 955056cd..0ae20734 100644
--- a/heatclient/tests/fakes.py
+++ b/heatclient/tests/fakes.py
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from heatclient.common import http
 from heatclient import exc
diff --git a/heatclient/tests/test_shell.py b/heatclient/tests/test_shell.py
index 9458eb1c..7bab129d 100644
--- a/heatclient/tests/test_shell.py
+++ b/heatclient/tests/test_shell.py
@@ -26,8 +26,8 @@ import testtools
 import uuid
 import yaml
 
-from oslo.serialization import jsonutils
-from oslo.utils import encodeutils
+from oslo_serialization import jsonutils
+from oslo_utils import encodeutils
 from requests_mock.contrib import fixture as rm_fixture
 
 from keystoneclient import fixture as keystone_fixture
diff --git a/heatclient/v1/events.py b/heatclient/v1/events.py
index 205e8aba..e94717ac 100644
--- a/heatclient/v1/events.py
+++ b/heatclient/v1/events.py
@@ -13,11 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_utils import encodeutils
 import six
 from six.moves.urllib import parse
 
-from oslo.utils import encodeutils
-
 from heatclient.openstack.common.apiclient import base
 from heatclient.v1 import stacks
 
diff --git a/heatclient/v1/resource_types.py b/heatclient/v1/resource_types.py
index 527e3bf7..b1d39c95 100644
--- a/heatclient/v1/resource_types.py
+++ b/heatclient/v1/resource_types.py
@@ -11,10 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_utils import encodeutils
 from six.moves.urllib import parse
 
-from oslo.utils import encodeutils
-
 from heatclient.openstack.common.apiclient import base
 
 
diff --git a/heatclient/v1/resources.py b/heatclient/v1/resources.py
index 24d9b189..5887a9da 100644
--- a/heatclient/v1/resources.py
+++ b/heatclient/v1/resources.py
@@ -13,10 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_utils import encodeutils
 from six.moves.urllib import parse
 
-from oslo.utils import encodeutils
-
 from heatclient.openstack.common.apiclient import base
 from heatclient.v1 import stacks
 
diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py
index 68e641e1..e8b5ba41 100644
--- a/heatclient/v1/shell.py
+++ b/heatclient/v1/shell.py
@@ -14,13 +14,13 @@
 #    under the License.
 
 import logging
+
+from oslo_serialization import jsonutils
+from oslo_utils import strutils
 import six
 from six.moves.urllib import request
 import yaml
 
-from oslo.serialization import jsonutils
-from oslo.utils import strutils
-
 from heatclient.common import deployment_utils
 from heatclient.common import template_format
 from heatclient.common import template_utils