diff --git a/keystone/tests/unit/test_cli.py b/keystone/tests/unit/test_cli.py
index c5c1a15a6d..9877d3f87e 100644
--- a/keystone/tests/unit/test_cli.py
+++ b/keystone/tests/unit/test_cli.py
@@ -240,7 +240,7 @@ class CliDomainConfigSingleDomainTestCase(CliDomainConfigAllTestCase):
         # Now try and upload the settings in the configuration file for the
         # default domain
         dependency.reset()
-        with mock.patch('__builtin__.print') as mock_print:
+        with mock.patch('six.moves.builtins.print') as mock_print:
             self.assertRaises(SystemExit, cli.DomainConfigUpload.main)
             file_name = ('keystone.%s.conf' %
                          resource.calc_default_domain()['name'])
@@ -266,7 +266,7 @@ class CliDomainConfigNoOptionsTestCase(CliDomainConfigAllTestCase):
 
     def test_config_upload(self):
         dependency.reset()
-        with mock.patch('__builtin__.print') as mock_print:
+        with mock.patch('six.moves.builtins.print') as mock_print:
             self.assertRaises(SystemExit, cli.DomainConfigUpload.main)
             mock_print.assert_has_calls(
                 [mock.call(
@@ -283,7 +283,7 @@ class CliDomainConfigTooManyOptionsTestCase(CliDomainConfigAllTestCase):
 
     def test_config_upload(self):
         dependency.reset()
-        with mock.patch('__builtin__.print') as mock_print:
+        with mock.patch('six.moves.builtins.print') as mock_print:
             self.assertRaises(SystemExit, cli.DomainConfigUpload.main)
             mock_print.assert_has_calls(
                 [mock.call(_('The --all option cannot be used with '
@@ -300,7 +300,7 @@ class CliDomainConfigInvalidDomainTestCase(CliDomainConfigAllTestCase):
 
     def test_config_upload(self):
         dependency.reset()
-        with mock.patch('__builtin__.print') as mock_print:
+        with mock.patch('six.moves.builtins.print') as mock_print:
             self.assertRaises(SystemExit, cli.DomainConfigUpload.main)
             file_name = 'keystone.%s.conf' % self.invalid_domain_name
             error_msg = (_(
diff --git a/tox.ini b/tox.ini
index 8bfe2f6183..b8d0af6f3e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,6 +46,7 @@ commands =
       keystone/tests/unit/test_backend.py \
       keystone/tests/unit/test_backend_rules.py \
       keystone/tests/unit/test_backend_sql.py \
+      keystone/tests/unit/test_cli.py \
       keystone/tests/unit/test_config.py \
       keystone/tests/unit/test_contrib_ec2.py \
       keystone/tests/unit/test_contrib_s3_core.py \