diff --git a/cms/envs/bok_choy.env.json b/cms/envs/bok_choy.env.json
index 835bba51aed909573e21bb5cd25874b687c111fc..daff45b4434eef341ff3f1b0d670c0069e8e2477 100644
--- a/cms/envs/bok_choy.env.json
+++ b/cms/envs/bok_choy.env.json
@@ -64,7 +64,6 @@
         "CUSTOM_COURSE_URLS": true
     },
     "FEATURES": {
-        "AUTH_USE_OPENID_PROVIDER": true,
         "CERTIFICATES_HTML_VIEW": true,
         "ENABLE_DISCUSSION_SERVICE": true,
         "ENABLE_GRADE_DOWNLOADS": true,
diff --git a/cms/envs/bok_choy.yml b/cms/envs/bok_choy.yml
index 741918ef783e88a3e6cbea6cf73f52efda98d4f6..c6c90bddf88d9b203847bfcd3a63b4cf73e840f8 100644
--- a/cms/envs/bok_choy.yml
+++ b/cms/envs/bok_choy.yml
@@ -68,7 +68,7 @@ DOC_STORE_CONFIG:
   host: [localhost]
   port: 27017
 EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend
-FEATURES: {AUTH_USE_OPENID_PROVIDER: true, CERTIFICATES_HTML_VIEW: true, CUSTOM_COURSES_EDX: true,
+FEATURES: {CERTIFICATES_HTML_VIEW: true, CUSTOM_COURSES_EDX: true,
   ENABLE_CONTENT_LIBRARIES: true, ENABLE_DISCUSSION_SERVICE: true, ENABLE_EXTENDED_COURSE_DETAILS: true,
   ENABLE_GRADE_DOWNLOADS: true, ENABLE_SPECIAL_EXAMS: true, ENTRANCE_EXAMS: true,
   MILESTONES_APP: true, PREVIEW_LMS_BASE: 'preview.localhost:8003', SHOW_HEADER_LANGUAGE_SELECTOR: true}
diff --git a/cms/envs/bok_choy_docker.env.json b/cms/envs/bok_choy_docker.env.json
index cc8b9daa53f57c4ff1d200ae9f3ac1a4b2b05cb6..f5d18281e95179a23f75d1a0c809d70367aa0d7a 100644
--- a/cms/envs/bok_choy_docker.env.json
+++ b/cms/envs/bok_choy_docker.env.json
@@ -64,7 +64,6 @@
         "CUSTOM_COURSE_URLS": true
     },
     "FEATURES": {
-        "AUTH_USE_OPENID_PROVIDER": true,
         "CERTIFICATES_HTML_VIEW": true,
         "ENABLE_DISCUSSION_SERVICE": true,
         "ENABLE_GRADE_DOWNLOADS": true,
diff --git a/cms/envs/bok_choy_docker.yml b/cms/envs/bok_choy_docker.yml
index 2a162460a43bde6fa7c77d4fbed87b11e1d2a003..fe16be148a501754bbd39ca9410c0957cc9a1874 100644
--- a/cms/envs/bok_choy_docker.yml
+++ b/cms/envs/bok_choy_docker.yml
@@ -68,7 +68,7 @@ DOC_STORE_CONFIG:
   host: [edx.devstack.mongo]
   port: 27017
 EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend
-FEATURES: {AUTH_USE_OPENID_PROVIDER: true, CERTIFICATES_HTML_VIEW: true, CUSTOM_COURSES_EDX: true,
+FEATURES: {CERTIFICATES_HTML_VIEW: true, CUSTOM_COURSES_EDX: true,
   ENABLE_CONTENT_LIBRARIES: true, ENABLE_DISCUSSION_SERVICE: true, ENABLE_EXTENDED_COURSE_DETAILS: true,
   ENABLE_GRADE_DOWNLOADS: true, ENABLE_SPECIAL_EXAMS: true, ENTRANCE_EXAMS: true,
   MILESTONES_APP: true, PREVIEW_LMS_BASE: 'preview.localhost:8003', SHOW_HEADER_LANGUAGE_SELECTOR: true}
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 696fee419b4415a7e95e35bffc0e8782e473c883..b23ffd933627224165e261ba28e65164fb420bd1 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -311,7 +311,6 @@ FEATURES = {
     # Prevent auto auth from creating superusers or modifying existing users
     'RESTRICT_AUTOMATIC_AUTH': True,
 
-    'AUTH_USE_OPENID_PROVIDER': True,
     'ENABLE_INSTRUCTOR_ANALYTICS': False,
     'PREVIEW_LMS_BASE': "preview.localhost:18000",
     'ENABLE_GRADE_DOWNLOADS': True,
@@ -1590,7 +1589,6 @@ for app_name, insert_before in OPTIONAL_APPS:
 
 ### External auth usage -- prefixes for ENROLLMENT_DOMAIN
 SHIBBOLETH_DOMAIN_PREFIX = 'shib:'
-OPENID_DOMAIN_PREFIX = 'openid:'
 
 # Set request limits for maximum size of a request body and maximum number of GET/POST parameters. (>=Django 1.10)
 # Limits are currently disabled - but can be used for finer-grained denial-of-service protection.
diff --git a/lms/envs/bok_choy.yml b/lms/envs/bok_choy.yml
index c90d3c4221e0f2f1ccdf67cf3b1381a08d17e0cc..6c36a617ffcb0888c1aa5298cc8fbc554d5bb40f 100644
--- a/lms/envs/bok_choy.yml
+++ b/lms/envs/bok_choy.yml
@@ -77,7 +77,7 @@ EVENT_TRACKING_BACKENDS:
   mongo:
     ENGINE: eventtracking.backends.mongodb.MongoBackend
     OPTIONS: {collection: events, database: test}
-FEATURES: {ALLOW_AUTOMATED_SIGNUPS: true, AUTH_USE_OPENID_PROVIDER: true, AUTOMATIC_AUTH_FOR_TESTING: true,
+FEATURES: {ALLOW_AUTOMATED_SIGNUPS: true, AUTOMATIC_AUTH_FOR_TESTING: true,
   AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING: true, CERTIFICATES_HTML_VIEW: true,
   CERTIFICATES_INSTRUCTOR_GENERATION: true, CUSTOM_COURSES_EDX: true,
   ENABLE_COURSE_DISCOVERY: true, ENABLE_DISCUSSION_SERVICE: true, ENABLE_GRADE_DOWNLOADS: true,
diff --git a/lms/envs/bok_choy_docker.yml b/lms/envs/bok_choy_docker.yml
index f1765060b1707aac0e957f869be70f06e8a164f4..d1218e70ff28e64c2d0f5b8ece80da71005eaf0c 100644
--- a/lms/envs/bok_choy_docker.yml
+++ b/lms/envs/bok_choy_docker.yml
@@ -81,7 +81,7 @@ EVENT_TRACKING_BACKENDS:
       database: test
       host: [edx.devstack.mongo]
       port: 27017
-FEATURES: {ALLOW_AUTOMATED_SIGNUPS: true, AUTH_USE_OPENID_PROVIDER: true, AUTOMATIC_AUTH_FOR_TESTING: true,
+FEATURES: {ALLOW_AUTOMATED_SIGNUPS: true, AUTOMATIC_AUTH_FOR_TESTING: true,
   AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING: true, CERTIFICATES_HTML_VIEW: true,
   CERTIFICATES_INSTRUCTOR_GENERATION: true, CUSTOM_COURSES_EDX: true,
   ENABLE_COURSE_DISCOVERY: true, ENABLE_DISCUSSION_SERVICE: true, ENABLE_GRADE_DOWNLOADS: true,
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 936caa43dc44edb70c2f622316f7eea8ad22898f..8bc4198510be63fb7d3eed31b28eb75764171f83 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -3110,7 +3110,6 @@ for app_name, insert_before in OPTIONAL_APPS:
 
 ### External auth usage -- prefixes for ENROLLMENT_DOMAIN
 SHIBBOLETH_DOMAIN_PREFIX = 'shib:'
-OPENID_DOMAIN_PREFIX = 'openid:'
 
 ### Analytics API
 ANALYTICS_API_KEY = ""
diff --git a/lms/envs/test.py b/lms/envs/test.py
index cc10e2a0a8991569d94f7a860f07c7635569a509..895621ef6cd1056f43e8c7b6e17330cd0768c9f6 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -274,11 +274,6 @@ THIRD_PARTY_AUTH_CUSTOM_AUTH_FORMS = {
     },
 }
 
-OPENID_CREATE_USERS = False
-OPENID_UPDATE_DETAILS_FROM_SREG = True
-OPENID_USE_AS_ADMIN_LOGIN = False
-OPENID_PROVIDER_TRUSTED_ROOTS = ['*']
-
 ############################## OAUTH2 Provider ################################
 FEATURES['ENABLE_OAUTH2_PROVIDER'] = True
 OAUTH_ENFORCE_SECURE = False