diff --git a/common/test/acceptance/fixtures/base.py b/common/test/acceptance/fixtures/base.py
index f415e11f48..6b4a3b15f2 100644
--- a/common/test/acceptance/fixtures/base.py
+++ b/common/test/acceptance/fixtures/base.py
@@ -6,7 +6,6 @@ Common code shared by course and library fixtures.
 import json
 
 import requests
-import six  # lint-amnesty, pylint: disable=unused-import
 from lazy import lazy
 
 from common.test.acceptance.fixtures import STUDIO_BASE_URL
diff --git a/common/test/acceptance/pages/lms/video/video.py b/common/test/acceptance/pages/lms/video/video.py
index 55ce59e76f..91a234d0c2 100644
--- a/common/test/acceptance/pages/lms/video/video.py
+++ b/common/test/acceptance/pages/lms/video/video.py
@@ -7,7 +7,7 @@ import logging
 
 from bok_choy.javascript import js_defined, wait_for_js
 from bok_choy.page_object import PageObject
-from bok_choy.promise import EmptyPromise, Promise  # lint-amnesty, pylint: disable=unused-import
+from bok_choy.promise import EmptyPromise  # lint-amnesty, pylint: disable=unused-import
 
 log = logging.getLogger('VideoPage')
 
diff --git a/common/test/acceptance/pages/studio/overview.py b/common/test/acceptance/pages/studio/overview.py
index 409e5e12cb..bc6d7b5ff0 100644
--- a/common/test/acceptance/pages/studio/overview.py
+++ b/common/test/acceptance/pages/studio/overview.py
@@ -3,7 +3,7 @@ Course Outline page in Studio.
 """
 
 
-from bok_choy.javascript import js_defined, wait_for_js  # lint-amnesty, pylint: disable=unused-import
+from bok_choy.javascript import js_defined  # lint-amnesty, pylint: disable=unused-import
 from bok_choy.page_object import PageObject
 from bok_choy.promise import EmptyPromise
 from selenium.webdriver.support.ui import Select
diff --git a/common/test/acceptance/tests/discussion/test_discussion.py b/common/test/acceptance/tests/discussion/test_discussion.py
index b37ae7180a..a0cbd83e49 100644
--- a/common/test/acceptance/tests/discussion/test_discussion.py
+++ b/common/test/acceptance/tests/discussion/test_discussion.py
@@ -7,17 +7,19 @@ from uuid import uuid4
 
 import pytest
 
-from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc  # lint-amnesty, pylint: disable=unused-import
+from common.test.acceptance.fixtures.course import CourseFixture  # lint-amnesty, pylint: disable=unused-import
 from common.test.acceptance.fixtures.discussion import (
     Comment,
     Response,
     SingleThreadViewFixture,
     Thread,
+
 )
 from common.test.acceptance.pages.common.auto_auth import AutoAuthPage
 from common.test.acceptance.pages.lms.discussion import (
     DiscussionTabHomePage,
     DiscussionTabSingleThreadPage,
+
 )
 from common.test.acceptance.tests.discussion.helpers import BaseDiscussionMixin, BaseDiscussionTestCase
 from common.test.acceptance.tests.helpers import UniqueCourseTest
diff --git a/common/test/acceptance/tests/helpers.py b/common/test/acceptance/tests/helpers.py
index de03eef29d..f3f4c8cff7 100644
--- a/common/test/acceptance/tests/helpers.py
+++ b/common/test/acceptance/tests/helpers.py
@@ -19,12 +19,12 @@ from bok_choy.promise import EmptyPromise, Promise
 from bok_choy.web_app_test import WebAppTest
 from opaque_keys.edx.locator import CourseLocator
 from path import Path as path
-from pymongo import ASCENDING, MongoClient  # lint-amnesty, pylint: disable=unused-import
+from pymongo import MongoClient  # lint-amnesty, pylint: disable=unused-import
 from selenium.common.exceptions import StaleElementReferenceException
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.select import Select
 from selenium.webdriver.support.ui import WebDriverWait
-from six.moves import range, zip  # lint-amnesty, pylint: disable=unused-import
+from six.moves import range  # lint-amnesty, pylint: disable=unused-import
 
 from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
 from common.test.acceptance.fixtures.course import XBlockFixtureDesc
diff --git a/common/test/conftest.py b/common/test/conftest.py
index 055da4ea8a..32b122bbca 100644
--- a/common/test/conftest.py
+++ b/common/test/conftest.py
@@ -1,9 +1,4 @@
 """Code run by pylint before running any tests."""
-
-# Patch the xml libs before anything else.
-
-
-from openedx.core.pytest_hooks import pytest_configure  # pylint: disable=unused-import
 from safe_lxml import defuse_xml_libs
 
 defuse_xml_libs()
diff --git a/common/test/utils.py b/common/test/utils.py
index f1744f3f51..54a03b7d8f 100644
--- a/common/test/utils.py
+++ b/common/test/utils.py
@@ -6,8 +6,6 @@ General testing utilities.
 import functools
 import sys
 from contextlib import contextmanager
-
-import pytest  # lint-amnesty, pylint: disable=unused-import
 from django.dispatch import Signal
 from markupsafe import escape
 from mock import Mock, patch