1 files changed, 8 insertions, 2 deletions
diff --git a/ipatests/test_ipalib/test_base.py b/ipatests/test_ipalib/test_base.py
index 67a82aa92..9b1b6a778 100644
--- a/ipatests/test_ipalib/test_base.py
+++ b/ipatests/test_ipalib/test_base.py
@@ -183,8 +183,14 @@ def test_check_name():
     ]
     for name in okay:
         assert name is f(name)
-        e = raises(TypeError, f, unicode(name))
-        assert str(e) == TYPE_ERROR % ('name', str, unicode(name), unicode)
+        if six.PY2:
+            bad_type = unicode
+            bad_value = unicode(name)
+        else:
+            bad_type = bytes
+            bad_value = name.encode('ascii')
+        e = raises(TypeError, f, bad_value)
+        assert str(e) == TYPE_ERROR % ('name', str, bad_value, bad_type)
     for name in nope:
         e = raises(ValueError, f, name)
         assert str(e) == NAME_ERROR % (NAME_REGEX, name)