2 files changed, 5 insertions, 5 deletions

diff --git a/src/mailman/commands/tests/test_conf.py b/src/mailman/commands/tests/test_conf.py
index 12ed5c537..cc0f61ba2 100644
--- a/src/mailman/commands/tests/test_conf.py
+++ b/src/mailman/commands/tests/test_conf.py
@@ -31,9 +31,9 @@ import mock
 import tempfile
 import unittest
 
-from StringIO import StringIO
 from mailman.commands.cli_conf import Conf
 from mailman.testing.layers import ConfigLayer
+from six import StringIO
 
 
 
diff --git a/src/mailman/commands/tests/test_help.py b/src/mailman/commands/tests/test_help.py
index 3c7d1ae9f..74eaae84e 100644
--- a/src/mailman/commands/tests/test_help.py
+++ b/src/mailman/commands/tests/test_help.py
@@ -47,11 +47,11 @@ class TestHelp(unittest.TestCase):
     def test_too_many_arguments(self):
         # Error message when too many help arguments are given.
         results = Results()
-        status = self._help.process(self._mlist, Message(), {}, 
+        status = self._help.process(self._mlist, Message(), {},
                                     ('more', 'than', 'one'),
                                     results)
         self.assertEqual(status, ContinueProcessing.no)
-        self.assertEqual(unicode(results), """\
+        self.assertEqual(results.decode('utf-8'), """\
 The results of your email command are provided below.
 
 help: too many arguments: more than one
@@ -60,10 +60,10 @@ help: too many arguments: more than one
     def test_no_such_command(self):
         # Error message when asking for help on an existent command.
         results = Results()
-        status = self._help.process(self._mlist, Message(), {}, 
+        status = self._help.process(self._mlist, Message(), {},
                                     ('doesnotexist',), results)
         self.assertEqual(status, ContinueProcessing.no)
-        self.assertEqual(unicode(results), """\
+        self.assertEqual(results.decode('utf-8'), """\
 The results of your email command are provided below.
 
 help: no such command: doesnotexist