diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py
index 5e596783cd..0df379aa54 100644
--- a/cms/envs/acceptance.py
+++ b/cms/envs/acceptance.py
@@ -113,7 +113,7 @@ SELENIUM_GRID = {
 #####################################################################
 # Lastly, see if the developer has any local overrides.
 try:
-    from .private import *  # pylint: disable=F0401
+    from .private import *  # pylint: disable=import-error
 except ImportError:
     pass
 
diff --git a/cms/envs/bok_choy.py b/cms/envs/bok_choy.py
index f8a6fda879..7353253456 100644
--- a/cms/envs/bok_choy.py
+++ b/cms/envs/bok_choy.py
@@ -66,6 +66,6 @@ YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YO
 #####################################################################
 # Lastly, see if the developer has any local overrides.
 try:
-    from .private import *      # pylint: disable=F0401
+    from .private import *      # pylint: disable=import-error
 except ImportError:
     pass
diff --git a/cms/envs/dev.py b/cms/envs/dev.py
index edfe8fe8eb..f0aa0fc006 100644
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -180,6 +180,6 @@ if SEGMENT_IO_KEY:
 #####################################################################
 # Lastly, see if the developer has any local overrides.
 try:
-    from .private import *  # pylint: disable=F0401
+    from .private import *  # pylint: disable=import-error
 except ImportError:
     pass
diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index f45e601e6e..50fc0a1b37 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -78,7 +78,7 @@ DEBUG_TOOLBAR_MONGO_STACKTRACES = False
 ###############################################################################
 # See if the developer has any local overrides.
 try:
-    from .private import *  # pylint: disable=F0401
+    from .private import *  # pylint: disable=import-error
 except ImportError:
     pass
 
diff --git a/common/djangoapps/student/management/tests/test_transfer_students.py b/common/djangoapps/student/management/tests/test_transfer_students.py
index a0d14a93aa..4d4d6c6be0 100644
--- a/common/djangoapps/student/management/tests/test_transfer_students.py
+++ b/common/djangoapps/student/management/tests/test_transfer_students.py
@@ -7,7 +7,7 @@ from opaque_keys.edx import locator
 import unittest
 import ddt
 
-from shoppingcart.models import Order, CertificateItem  # pylint: disable=F0401
+from shoppingcart.models import Order, CertificateItem  # pylint: disable=import-error
 from course_modes.models import CourseMode
 from student.management.commands import transfer_students
 from student.models import CourseEnrollment, UNENROLL_DONE, EVENT_NAME_ENROLLMENT_DEACTIVATED, \
diff --git a/common/djangoapps/third_party_auth/pipeline.py b/common/djangoapps/third_party_auth/pipeline.py
index d1fd527fef..4564f5533a 100644
--- a/common/djangoapps/third_party_auth/pipeline.py
+++ b/common/djangoapps/third_party_auth/pipeline.py
@@ -73,8 +73,8 @@ from social.exceptions import AuthException
 from social.pipeline import partial
 
 import student
-from shoppingcart.models import Order, PaidCourseRegistration  # pylint: disable=F0401
-from shoppingcart.exceptions import (  # pylint: disable=F0401
+from shoppingcart.models import Order, PaidCourseRegistration  # pylint: disable=import-error
+from shoppingcart.exceptions import (  # pylint: disable=import-error
     CourseDoesNotExistException,
     ItemAlreadyInCartException,
     AlreadyEnrolledInCourseException
diff --git a/common/djangoapps/third_party_auth/tests/test_change_enrollment.py b/common/djangoapps/third_party_auth/tests/test_change_enrollment.py
index db76ff6904..f85ae38d48 100644
--- a/common/djangoapps/third_party_auth/tests/test_change_enrollment.py
+++ b/common/djangoapps/third_party_auth/tests/test_change_enrollment.py
@@ -5,7 +5,7 @@ import unittest
 import ddt
 import pytz
 from third_party_auth import pipeline
-from shoppingcart.models import Order, PaidCourseRegistration  # pylint: disable=F0401
+from shoppingcart.models import Order, PaidCourseRegistration  # pylint: disable=import-error
 from social.apps.django_app import utils as social_utils
 from django.conf import settings
 from django.contrib.sessions.backends import cache
diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py
index e4361ebacc..be978b66a0 100644
--- a/lms/envs/acceptance.py
+++ b/lms/envs/acceptance.py
@@ -159,7 +159,7 @@ SELENIUM_GRID = {
 #####################################################################
 # See if the developer has any local overrides.
 try:
-    from .private import *  # pylint: disable=F0401
+    from .private import *  # pylint: disable=import-error
 except ImportError:
     pass
 
diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py
index b111da3499..9ccd722e08 100644
--- a/lms/envs/bok_choy.py
+++ b/lms/envs/bok_choy.py
@@ -81,6 +81,6 @@ YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YO
 #####################################################################
 # Lastly, see if the developer has any local overrides.
 try:
-    from .private import *      # pylint: disable=F0401
+    from .private import *      # pylint: disable=import-error
 except ImportError:
     pass
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 8318cc26be..5a29293915 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -308,6 +308,6 @@ REGISTRATION_CODE_LENGTH = 8
 #####################################################################
 # Lastly, see if the developer has any local overrides.
 try:
-    from .private import *      # pylint: disable=F0401
+    from .private import *      # pylint: disable=import-error
 except ImportError:
     pass
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index cdd02fb329..255d180e8b 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -98,7 +98,7 @@ FEATURES['ENABLE_VIDEO_ABSTRACTION_LAYER_API'] = True
 #####################################################################
 # See if the developer has any local overrides.
 try:
-    from .private import *      # pylint: disable=F0401
+    from .private import *      # pylint: disable=import-error
 except ImportError:
     pass