1 files changed, 5 insertions, 4 deletions
diff --git a/jinja2/tests.py b/jinja2/tests.py
index 50510b0..140b5bf 100644
--- a/jinja2/tests.py
+++ b/jinja2/tests.py
@@ -10,6 +10,7 @@
 """
 import re
 from jinja2.runtime import Undefined
+import six
 
 try:
     from collections import Mapping as MappingType
@@ -76,17 +77,17 @@ def test_none(value):
 
 def test_lower(value):
     """Return true if the variable is lowercased."""
-    return unicode(value).islower()
+    return six.text_type(value).islower()
 
 
 def test_upper(value):
     """Return true if the variable is uppercased."""
-    return unicode(value).isupper()
+    return six.text_type(value).isupper()
 
 
 def test_string(value):
     """Return true if the object is a string."""
-    return isinstance(value, basestring)
+    return isinstance(value, six.string_types)
 
 
 def test_mapping(value):
@@ -99,7 +100,7 @@ def test_mapping(value):
 
 def test_number(value):
     """Return true if the variable is a number."""
-    return isinstance(value, (int, long, float, complex))
+    return isinstance(value, (int, float, complex))
 
 
 def test_sequence(value):