diff --git a/manila/share/drivers/glusterfs/__init__.py b/manila/share/drivers/glusterfs/__init__.py
index ecca496bde..8134d2f02d 100644
--- a/manila/share/drivers/glusterfs/__init__.py
+++ b/manila/share/drivers/glusterfs/__init__.py
@@ -32,6 +32,7 @@ from oslo_config import cfg
 from oslo_log import log
 
 from manila import exception
+from manila.i18n import _
 from manila.i18n import _LE
 from manila.share import driver
 from manila.share.drivers import ganesha
diff --git a/manila/tests/__init__.py b/manila/tests/__init__.py
index edb653e682..6132d017f4 100644
--- a/manila/tests/__init__.py
+++ b/manila/tests/__init__.py
@@ -29,10 +29,5 @@
 """
 
 import eventlet
-from six.moves import builtins
 
 eventlet.monkey_patch()
-
-# See http://code.google.com/p/python-nose/issues/detail?id=373
-# The code below enables nosetests to work with i18n _() blocks
-setattr(builtins, '_', lambda x: x)