diff --git a/common/lib/xmodule/xmodule/tests/test_conditional_logic.py b/common/lib/xmodule/xmodule/tests/test_conditional_logic.py
index 264cf239c4..b421cc19b2 100644
--- a/common/lib/xmodule/xmodule/tests/test_conditional_logic.py
+++ b/common/lib/xmodule/xmodule/tests/test_conditional_logic.py
@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 """Test for Conditional Xmodule functional logic."""
 
+from __future__ import absolute_import
+
 from xmodule.conditional_module import ConditionalDescriptor
+
 from . import LogicTest
 
 
diff --git a/common/lib/xmodule/xmodule/tests/test_course_module.py b/common/lib/xmodule/xmodule/tests/test_course_module.py
index 33213f552c..3bbc1dfd9f 100644
--- a/common/lib/xmodule/xmodule/tests/test_course_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_course_module.py
@@ -1,22 +1,22 @@
 """Tests the course modules and their functions"""
-from __future__ import print_function
-import ddt
-import unittest
-from datetime import datetime, timedelta
-from dateutil import parser
+from __future__ import absolute_import, print_function
 
 import itertools
-from fs.memoryfs import MemoryFS
-from mock import Mock, patch
-from pytz import utc
-from xblock.runtime import KvsFieldData, DictKeyValueStore
+import unittest
+from datetime import datetime, timedelta
+
+import ddt
+from dateutil import parser
 from django.conf import settings
 from django.test import override_settings
+from fs.memoryfs import MemoryFS
+from mock import Mock, patch
+from opaque_keys.edx.keys import CourseKey
+from pytz import utc
+from xblock.runtime import DictKeyValueStore, KvsFieldData
 
 import xmodule.course_module
 from xmodule.modulestore.xml import ImportSystem, XMLModuleStore
-from opaque_keys.edx.keys import CourseKey
-
 
 ORG = 'test_org'
 COURSE = 'test_course'
@@ -290,7 +290,7 @@ class TeamsConfigurationTestCase(unittest.TestCase):
 
     def make_topic(self):
         """ Make a sample topic dictionary. """
-        next_num = self.count.next()
+        next_num = next(self.count)
         topic_id = "topic_id_{}".format(next_num)
         name = "Name {}".format(next_num)
         description = "Description {}".format(next_num)
diff --git a/common/lib/xmodule/xmodule/tests/test_fields.py b/common/lib/xmodule/xmodule/tests/test_fields.py
index 7b3bc9c0f9..fef52e268d 100644
--- a/common/lib/xmodule/xmodule/tests/test_fields.py
+++ b/common/lib/xmodule/xmodule/tests/test_fields.py
@@ -1,11 +1,13 @@
 """Tests for classes defined in fields.py."""
 
+from __future__ import absolute_import
+
 import datetime
 import unittest
 
 from pytz import UTC
 
-from xmodule.fields import Date, Timedelta, RelativeTime
+from xmodule.fields import Date, RelativeTime, Timedelta
 from xmodule.timeinfo import TimeInfo
 
 
diff --git a/common/lib/xmodule/xmodule/tests/test_mongo_utils.py b/common/lib/xmodule/xmodule/tests/test_mongo_utils.py
index 4f56625b15..56cb898624 100644
--- a/common/lib/xmodule/xmodule/tests/test_mongo_utils.py
+++ b/common/lib/xmodule/xmodule/tests/test_mongo_utils.py
@@ -1,11 +1,13 @@
 """
 Tests for methods defined in mongo_utils.py
 """
-import ddt
+from __future__ import absolute_import
+
 import os
 from unittest import TestCase
 from uuid import uuid4
 
+import ddt
 from pymongo import ReadPreference
 
 from xmodule.mongo_utils import connect_to_mongodb
diff --git a/common/lib/xmodule/xmodule/tests/test_progress.py b/common/lib/xmodule/xmodule/tests/test_progress.py
index 539f9042e5..036cdb72d8 100644
--- a/common/lib/xmodule/xmodule/tests/test_progress.py
+++ b/common/lib/xmodule/xmodule/tests/test_progress.py
@@ -1,12 +1,14 @@
 """Module progress tests"""
 
-import unittest
-from mock import Mock
+from __future__ import absolute_import
 
+import unittest
+
+from mock import Mock
 from xblock.field_data import DictFieldData
 
-from xmodule.progress import Progress
 from xmodule import x_module
+from xmodule.progress import Progress
 
 from . import get_test_system
 
diff --git a/common/lib/xmodule/xmodule/tests/test_resource_templates.py b/common/lib/xmodule/xmodule/tests/test_resource_templates.py
index f6a0e84933..5a819f651c 100644
--- a/common/lib/xmodule/xmodule/tests/test_resource_templates.py
+++ b/common/lib/xmodule/xmodule/tests/test_resource_templates.py
@@ -1,6 +1,8 @@
 """
 Tests for xmodule.x_module.ResourceTemplates
 """
+from __future__ import absolute_import
+
 import unittest
 
 from xmodule.x_module import ResourceTemplates
diff --git a/common/lib/xmodule/xmodule/tests/test_utils_escape_html_characters.py b/common/lib/xmodule/xmodule/tests/test_utils_escape_html_characters.py
index 430d78d1b8..f6e997aba3 100644
--- a/common/lib/xmodule/xmodule/tests/test_utils_escape_html_characters.py
+++ b/common/lib/xmodule/xmodule/tests/test_utils_escape_html_characters.py
@@ -1,7 +1,10 @@
 """Tests for methods defined in util/misc.py"""
-from xmodule.util.misc import escape_html_characters
+from __future__ import absolute_import
+
 from unittest import TestCase
 
+from xmodule.util.misc import escape_html_characters
+
 
 class UtilHtmlEscapeTests(TestCase):
     """