diff --git a/mwparserfromhell/compat.py b/mwparserfromhell/compat.py
index a142128..9c8ce8c 100644
--- a/mwparserfromhell/compat.py
+++ b/mwparserfromhell/compat.py
@@ -16,12 +16,14 @@ py32 = py3k and sys.version_info.minor == 2
 if py3k:
     bytes = bytes
     str = str
+    range = xrange
     maxsize = sys.maxsize
     import html.entities as htmlentities
 
 else:
     bytes = str
     str = unicode
+    range = range
     maxsize = sys.maxint
     import htmlentitydefs as htmlentities
 
diff --git a/mwparserfromhell/nodes/template.py b/mwparserfromhell/nodes/template.py
index c9f99bf..bb0b912 100644
--- a/mwparserfromhell/nodes/template.py
+++ b/mwparserfromhell/nodes/template.py
@@ -26,7 +26,7 @@ import re
 
 from . import HTMLEntity, Node, Text
 from .extras import Parameter
-from ..compat import str
+from ..compat import range, str
 from ..utils import parse_anything
 
 __all__ = ["Template"]
diff --git a/mwparserfromhell/parser/tokenizer.py b/mwparserfromhell/parser/tokenizer.py
index 8d12b62..bbc3b4c 100644
--- a/mwparserfromhell/parser/tokenizer.py
+++ b/mwparserfromhell/parser/tokenizer.py
@@ -25,7 +25,7 @@ from math import log
 import re
 
 from . import contexts, tokens
-from ..compat import htmlentities
+from ..compat import htmlentities, range
 from ..definitions import (get_html_tag, is_parsable, is_single,
                            is_single_only, is_scheme)
 
diff --git a/tests/_test_tree_equality.py b/tests/_test_tree_equality.py
index bd1f08f..3305bc1 100644
--- a/tests/_test_tree_equality.py
+++ b/tests/_test_tree_equality.py
@@ -23,6 +23,7 @@
 from __future__ import unicode_literals
 from unittest import TestCase
 
+from mwparserfromhell.compat import range
 from mwparserfromhell.nodes import (Argument, Comment, Heading, HTMLEntity,
                                     Tag, Template, Text, Wikilink)
 from mwparserfromhell.nodes.extras import Attribute, Parameter
diff --git a/tests/compat.py b/tests/compat.py
index 8bed40e..d5b3fba 100644
--- a/tests/compat.py
+++ b/tests/compat.py
@@ -9,12 +9,10 @@ the main library.
 from mwparserfromhell.compat import py3k
 
 if py3k:
-    range = range
     from io import StringIO
     from urllib.parse import urlencode
     from urllib.request import urlopen
 
 else:
-    range = xrange
     from StringIO import StringIO
     from urllib import urlencode, urlopen
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 672cbff..9975824 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -24,11 +24,11 @@ from __future__ import unicode_literals
 import unittest
 
 from mwparserfromhell import parser
+from mwparserfromhell.compat import range
 from mwparserfromhell.nodes import Tag, Template, Text, Wikilink
 from mwparserfromhell.nodes.extras import Parameter
 
 from ._test_tree_equality import TreeEqualityTestCase, wrap, wraptext
-from .compat import range
 
 class TestParser(TreeEqualityTestCase):
     """Tests for the Parser class itself, which tokenizes and builds nodes."""
diff --git a/tests/test_smart_list.py b/tests/test_smart_list.py
index 16cbac0..d566f96 100644
--- a/tests/test_smart_list.py
+++ b/tests/test_smart_list.py
@@ -23,11 +23,9 @@
 from __future__ import unicode_literals
 import unittest
 
-from mwparserfromhell.compat import py3k
+from mwparserfromhell.compat import py3k, range
 from mwparserfromhell.smart_list import SmartList, _ListProxy
 
-from .compat import range
-
 class TestSmartList(unittest.TestCase):
     """Test cases for the SmartList class and its child, _ListProxy."""
 
diff --git a/tests/test_string_mixin.py b/tests/test_string_mixin.py
index ad12df7..43ae9f4 100644
--- a/tests/test_string_mixin.py
+++ b/tests/test_string_mixin.py
@@ -25,11 +25,9 @@ from sys import getdefaultencoding
 from types import GeneratorType
 import unittest
 
-from mwparserfromhell.compat import bytes, py3k, py32, str
+from mwparserfromhell.compat import bytes, py3k, py32, range, str
 from mwparserfromhell.string_mixin import StringMixIn
 
-from .compat import range
-
 class _FakeString(StringMixIn):
     def __init__(self, data):
         self._data = data
diff --git a/tests/test_wikicode.py b/tests/test_wikicode.py
index c974be4..c09f8a2 100644
--- a/tests/test_wikicode.py
+++ b/tests/test_wikicode.py
@@ -26,12 +26,12 @@ import re
 from types import GeneratorType
 import unittest
 
+from mwparserfromhell.compat import py3k, str
 from mwparserfromhell.nodes import (Argument, Comment, Heading, HTMLEntity,
                                     Node, Tag, Template, Text, Wikilink)
 from mwparserfromhell.smart_list import SmartList
 from mwparserfromhell.wikicode import Wikicode
 from mwparserfromhell import parse
-from mwparserfromhell.compat import py3k, str
 
 from ._test_tree_equality import TreeEqualityTestCase, wrap, wraptext