diff --git a/trove/common/auth.py b/trove/common/auth.py
index 2bec77b98e..d32f9a646a 100644
--- a/trove/common/auth.py
+++ b/trove/common/auth.py
@@ -18,10 +18,10 @@ import re
 from oslo_log import log as logging
 from oslo_utils import strutils
 import webob.exc
-import wsgi
 
 from trove.common import exception
 from trove.common.i18n import _
+from trove.common import wsgi
 
 LOG = logging.getLogger(__name__)
 
diff --git a/trove/guestagent/datastore/experimental/postgresql/manager.py b/trove/guestagent/datastore/experimental/postgresql/manager.py
index 686f28c60b..b491506862 100644
--- a/trove/guestagent/datastore/experimental/postgresql/manager.py
+++ b/trove/guestagent/datastore/experimental/postgresql/manager.py
@@ -24,12 +24,11 @@ from .service.install import PgSqlInstall
 from .service.root import PgSqlRoot
 from .service.status import PgSqlAppStatus
 
-import pgutil
-
 from trove.common import cfg
 from trove.common.notification import EndNotification
 from trove.common import utils
 from trove.guestagent import backup
+from trove.guestagent.datastore.experimental.postgresql import pgutil
 from trove.guestagent.datastore import manager
 from trove.guestagent import guest_log
 from trove.guestagent import volume