diff --git a/common/djangoapps/student/helpers.py b/common/djangoapps/student/helpers.py
index 332c1ca162..b7321c563d 100644
--- a/common/djangoapps/student/helpers.py
+++ b/common/djangoapps/student/helpers.py
@@ -21,7 +21,6 @@ from django.db import IntegrityError, transaction, ProgrammingError
 from django.urls import NoReverseMatch, reverse
 from django.utils.translation import ugettext as _
 from pytz import UTC
-from six import iteritems, text_type
 
 from common.djangoapps import third_party_auth
 from common.djangoapps.course_modes.models import CourseMode
diff --git a/common/djangoapps/student/management/tests/test_change_eligibility_deadline.py b/common/djangoapps/student/management/tests/test_change_eligibility_deadline.py
index f1391467c1..5c7fea30f5 100644
--- a/common/djangoapps/student/management/tests/test_change_eligibility_deadline.py
+++ b/common/djangoapps/student/management/tests/test_change_eligibility_deadline.py
@@ -6,7 +6,6 @@ import pytest
 
 from django.core.management import call_command
 from opaque_keys import InvalidKeyError
-from six import text_type
 from testfixtures import LogCapture
 
 from common.djangoapps.course_modes.tests.factories import CourseMode
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 08d1e2cc2c..9715c60a34 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -24,7 +24,6 @@ from importlib import import_module
 from urllib.parse import urlencode
 import warnings
 
-import six
 from config_models.models import ConfigurationModel
 from django.apps import apps
 from django.conf import settings
@@ -53,7 +52,6 @@ from opaque_keys.edx.django.models import CourseKeyField, LearningContextKeyFiel
 from opaque_keys.edx.keys import CourseKey
 from pytz import UTC, timezone
 from simple_history.models import HistoricalRecords
-from six import text_type
 from slumber.exceptions import HttpClientError, HttpServerError
 from user_util import user_util
 
diff --git a/common/djangoapps/student/roles.py b/common/djangoapps/student/roles.py
index e936277562..052eb30862 100644
--- a/common/djangoapps/student/roles.py
+++ b/common/djangoapps/student/roles.py
@@ -8,7 +8,6 @@ import logging
 from abc import ABCMeta, abstractmethod
 from collections import defaultdict
 
-import six
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from opaque_keys.edx.django.models import CourseKeyField
 
diff --git a/common/djangoapps/student/tests/factories.py b/common/djangoapps/student/tests/factories.py
index 5f404c1e96..ecffdf63cd 100644
--- a/common/djangoapps/student/tests/factories.py
+++ b/common/djangoapps/student/tests/factories.py
@@ -5,7 +5,6 @@ from datetime import datetime
 from uuid import uuid4
 
 import factory
-import six
 from django.contrib.auth.models import AnonymousUser, Group, Permission
 from django.contrib.contenttypes.models import ContentType
 from factory.django import DjangoModelFactory
diff --git a/common/djangoapps/student/tests/test_admin_views.py b/common/djangoapps/student/tests/test_admin_views.py
index 4b5a351b78..c19af00518 100644
--- a/common/djangoapps/student/tests/test_admin_views.py
+++ b/common/djangoapps/student/tests/test_admin_views.py
@@ -8,7 +8,6 @@ from unittest.mock import Mock
 
 import ddt
 import pytest
-import six
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.forms import ValidationError
diff --git a/common/djangoapps/student/tests/test_course_listing.py b/common/djangoapps/student/tests/test_course_listing.py
index c061ed3899..4679f5e053 100644
--- a/common/djangoapps/student/tests/test_course_listing.py
+++ b/common/djangoapps/student/tests/test_course_listing.py
@@ -7,7 +7,6 @@ by reversing group name formats.
 import unittest
 
 from unittest import mock
-import six
 from django.conf import settings
 from django.test.client import Client
 from milestones.tests.utils import MilestonesTestCaseMixin
diff --git a/common/djangoapps/student/tests/test_email.py b/common/djangoapps/student/tests/test_email.py
index f11f35a1fb..5c48dc8ee0 100644
--- a/common/djangoapps/student/tests/test_email.py
+++ b/common/djangoapps/student/tests/test_email.py
@@ -15,7 +15,6 @@ from django.test.client import RequestFactory
 from django.urls import reverse
 from django.utils.html import escape
 from edx_toggles.toggles.testutils import override_waffle_flag
-from six import text_type
 
 from common.djangoapps.edxmako.shortcuts import marketing_link
 from common.djangoapps.student.email_helpers import generate_proctoring_requirements_email_context
diff --git a/common/djangoapps/student/tests/test_enrollment.py b/common/djangoapps/student/tests/test_enrollment.py
index 483aa39f46..0b34fd107d 100644
--- a/common/djangoapps/student/tests/test_enrollment.py
+++ b/common/djangoapps/student/tests/test_enrollment.py
@@ -8,7 +8,6 @@ from unittest.mock import patch
 
 import ddt
 import pytest
-import six
 from django.conf import settings
 from django.urls import reverse
 from edx_toggles.toggles.testutils import override_waffle_flag
diff --git a/common/djangoapps/student/tests/test_long_username_email.py b/common/djangoapps/student/tests/test_long_username_email.py
index dbb5669a4d..bee416100e 100644
--- a/common/djangoapps/student/tests/test_long_username_email.py
+++ b/common/djangoapps/student/tests/test_long_username_email.py
@@ -1,3 +1,4 @@
+""" Test case for longer user emails."""
 import json
 
 from django.test import TestCase
diff --git a/common/djangoapps/student/tests/test_views.py b/common/djangoapps/student/tests/test_views.py
index fd79c1835e..59d91b20da 100644
--- a/common/djangoapps/student/tests/test_views.py
+++ b/common/djangoapps/student/tests/test_views.py
@@ -11,7 +11,6 @@ from datetime import timedelta  # lint-amnesty, pylint: disable=unused-import
 from unittest.mock import patch
 
 import ddt
-import six
 from completion.test_utils import CompletionWaffleTestMixin, submit_completions_for_testing
 from django.conf import settings
 from django.test import TestCase
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index cab8473704..9acf4e4340 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -23,7 +23,6 @@ from django.test import RequestFactory, TestCase
 from django.urls import reverse as django_reverse
 from django.utils.translation import ugettext as _
 from edx_when.api import get_dates_for_course, get_overrides_for_user, set_date_for_block
-from freezegun import freeze_time
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import UsageKey
 from pytz import UTC
diff --git a/openedx/features/discounts/tests/test_utils.py b/openedx/features/discounts/tests/test_utils.py
index 15a3b26005..1ff305831d 100644
--- a/openedx/features/discounts/tests/test_utils.py
+++ b/openedx/features/discounts/tests/test_utils.py
@@ -4,7 +4,6 @@ Tests of the openedx.features.discounts.utils module.
 from unittest.mock import patch, Mock
 
 import ddt
-import six
 from django.contrib.auth.models import AnonymousUser
 from django.test import TestCase
 from django.utils.translation import override as override_lang
diff --git a/openedx/features/discounts/tests/test_views.py b/openedx/features/discounts/tests/test_views.py
index 5a735375c3..a5ed4060cd 100644
--- a/openedx/features/discounts/tests/test_views.py
+++ b/openedx/features/discounts/tests/test_views.py
@@ -2,7 +2,6 @@
 
 
 import jwt
-import six
 from django.test.client import Client
 from django.urls import reverse