diff --git a/common/djangoapps/external_auth/views.py b/common/djangoapps/external_auth/views.py
index 99f14ffa2a..c5351f32e6 100644
--- a/common/djangoapps/external_auth/views.py
+++ b/common/djangoapps/external_auth/views.py
@@ -244,7 +244,8 @@ def ssl_login(request):
             # try the direct apache2 SSL key
             cert = request._req.subprocess_env.get(certkey, '')
         except Exception:
-            pass
+            cert = None
+
     if not cert:
         # no certificate information - go onward to main index
         return student_views.index(request)
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index e1d6071bbf..f36383951e 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -116,7 +116,7 @@ OPENID_UPDATE_DETAILS_FROM_SREG = True
 OPENID_SSO_SERVER_URL = 'https://www.google.com/accounts/o8/id'	# TODO: accept more endpoints
 OPENID_USE_AS_ADMIN_LOGIN = False
 
-OPENID_PROVIDER_TRUSTED_ROOTS = ['*'] 
+OPENID_PROVIDER_TRUSTED_ROOTS = ['*']
 
 ################################ MIT Certificates SSL Auth #################################
 MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES'] = True
diff --git a/lms/envs/test.py b/lms/envs/test.py
index c164889d79..7cab4cb52c 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -123,6 +123,11 @@ CACHES = {
 # Dummy secret key for dev
 SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
 
+################################## OPENID ######################################
+MITX_FEATURES['AUTH_USE_OPENID'] = True
+MITX_FEATURES['AUTH_USE_OPENID_PROVIDER'] = True
+OPENID_PROVIDER_TRUSTED_ROOTS = ['*']
+
 ############################ FILE UPLOADS (ASKBOT) #############################
 DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
 MEDIA_ROOT = TEST_ROOT / "uploads"