diff --git a/ironic/tests/__init__.py b/ironic/tests/__init__.py
index e45f578f1c..918237d30b 100644
--- a/ironic/tests/__init__.py
+++ b/ironic/tests/__init__.py
@@ -30,5 +30,5 @@ eventlet.monkey_patch(os=False)
 
 # See http://code.google.com/p/python-nose/issues/detail?id=373
 # The code below enables nosetests to work with i18n _() blocks
-import __builtin__
+import six.moves.builtins as __builtin__
 setattr(__builtin__, '_', lambda x: x)
diff --git a/ironic/tests/test_utils.py b/ironic/tests/test_utils.py
index ae030b57bc..34ad26fc29 100644
--- a/ironic/tests/test_utils.py
+++ b/ironic/tests/test_utils.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import __builtin__
 import errno
 import hashlib
 import os
@@ -25,6 +24,7 @@ import mock
 import netaddr
 from oslo.config import cfg
 import six
+import six.moves.builtins as __builtin__
 
 from ironic.common import exception
 from ironic.common import utils
diff --git a/tools/flakes.py b/tools/flakes.py
index 191bd6eabc..6869a4477e 100644
--- a/tools/flakes.py
+++ b/tools/flakes.py
@@ -7,9 +7,8 @@
 
 __all__ = ['main']
 
-import __builtin__ as builtins
 import sys
-
+import six.moves.builtins as builtins
 import pyflakes.api
 from pyflakes import checker