diff --git a/bin/cinder-all b/bin/cinder-all
index 6f26901d798..566273c266d 100755
--- a/bin/cinder-all
+++ b/bin/cinder-all
@@ -45,7 +45,7 @@ if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")):
     sys.path.insert(0, possible_topdir)
 
 from cinder.openstack.common import gettextutils
-gettextutils.install('cinder')
+gettextutils.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config   # noqa
diff --git a/bin/cinder-api b/bin/cinder-api
index 6e83e767855..6be285476c5 100755
--- a/bin/cinder-api
+++ b/bin/cinder-api
@@ -35,7 +35,7 @@ if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")):
     sys.path.insert(0, possible_topdir)
 
 from cinder.openstack.common import gettextutils
-gettextutils.install('cinder')
+gettextutils.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa
diff --git a/bin/cinder-backup b/bin/cinder-backup
index 69f2c76bf05..fa747a63f76 100755
--- a/bin/cinder-backup
+++ b/bin/cinder-backup
@@ -39,7 +39,7 @@ if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 from cinder.openstack.common import gettextutils
-gettextutils.install('cinder')
+gettextutils.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa
diff --git a/bin/cinder-clear-rabbit-queues b/bin/cinder-clear-rabbit-queues
index bab50ec52ca..2328b2befe9 100755
--- a/bin/cinder-clear-rabbit-queues
+++ b/bin/cinder-clear-rabbit-queues
@@ -38,7 +38,7 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
 from cinder.openstack.common import gettextutils
-gettextutils.install('cinder')
+gettextutils.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa
diff --git a/bin/cinder-manage b/bin/cinder-manage
index 512cb8f3da8..a0448322661 100755
--- a/bin/cinder-manage
+++ b/bin/cinder-manage
@@ -73,7 +73,7 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
 from cinder.openstack.common import gettextutils
-gettextutils.install('cinder')
+gettextutils.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa
diff --git a/bin/cinder-rtstool b/bin/cinder-rtstool
index 410524345ea..7801268e728 100755
--- a/bin/cinder-rtstool
+++ b/bin/cinder-rtstool
@@ -22,6 +22,7 @@ import sys
 import rtslib
 
 gettext.install('cinder-rtstool', unicode=1)
+gettext.enable_lazy()
 
 
 class RtstoolError(Exception):
diff --git a/bin/cinder-scheduler b/bin/cinder-scheduler
index a01fe3e4e9b..cc04e22329d 100755
--- a/bin/cinder-scheduler
+++ b/bin/cinder-scheduler
@@ -39,7 +39,7 @@ if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 from cinder.openstack.common import gettextutils
-gettextutils.install('cinder')
+gettextutils.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa
diff --git a/bin/cinder-volume b/bin/cinder-volume
index 45c4ed4613e..f0fb798f9fd 100755
--- a/bin/cinder-volume
+++ b/bin/cinder-volume
@@ -43,7 +43,7 @@ if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 from cinder.openstack.common import gettextutils
-gettextutils.install('cinder')
+gettextutils.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa
diff --git a/bin/cinder-volume-usage-audit b/bin/cinder-volume-usage-audit
index 3f223d38a7b..13cb1c23118 100755
--- a/bin/cinder-volume-usage-audit
+++ b/bin/cinder-volume-usage-audit
@@ -53,7 +53,7 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
 from cinder.openstack.common import gettextutils
-gettextutils.install('cinder')
+gettextutils.enable_lazy()
 
 from cinder import context
 from cinder import db
diff --git a/cinder/db/sqlalchemy/migrate_repo/manage.py b/cinder/db/sqlalchemy/migrate_repo/manage.py
index 7cb4d399df8..d468a310707 100755
--- a/cinder/db/sqlalchemy/migrate_repo/manage.py
+++ b/cinder/db/sqlalchemy/migrate_repo/manage.py
@@ -18,7 +18,7 @@ import os
 from oslo.config import cfg
 
 from cinder.openstack.common import gettextutils
-gettextutils.install('cinder')
+gettextutils.enable_lazy()
 
 from cinder.db.sqlalchemy import migrate_repo
 from cinder import version
diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py
index 5c06e9c039a..000aeab1dd4 100644
--- a/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py
@@ -14,6 +14,7 @@
 
 import datetime
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from oslo.config import cfg
 from sqlalchemy import MetaData, Table