diff --git a/core/modules/openid/openid.test b/core/modules/openid/openid.test
index 01dcf21..24e643f 100644
--- a/core/modules/openid/openid.test
+++ b/core/modules/openid/openid.test
@@ -453,6 +453,7 @@ class OpenIDRegistrationTestCase extends OpenIDWebTestCase {
   }
 
   function setUp() {
+    // Add language module too to test with some non-built-in languages.
     parent::setUp('openid', 'openid_test', 'language');
     variable_set('user_register', USER_REGISTER_VISITORS);
   }
@@ -473,11 +474,18 @@ class OpenIDRegistrationTestCase extends OpenIDWebTestCase {
       'openid.sreg.timezone' => 'Europe/London',
     ));
 
-    // Save Portuguese as an optional language so OpenID can pick that.
+    // Save Portuguese and Portuguese, Portugal as optional languages. The
+    // process should pick 'pt' based on the sreg.language being 'pt-BR'
+    // (and falling back on least specific language given no pt-br available
+    // locally).
     $language = (object) array(
       'langcode' => 'pt',
     );
     language_save($language);
+    $language = (object) array(
+      'langcode' => 'pt-pt',
+    );
+    language_save($language);
 
     // Use a User-supplied Identity that is the URL of an XRDS document.
     $identity = url('openid-test/yadis/xrds', array('absolute' => TRUE));
@@ -523,7 +531,8 @@ class OpenIDRegistrationTestCase extends OpenIDWebTestCase {
       'openid.sreg.timezone' => 'Europe/London',
     ));
 
-    // Save Portuguese, Brazil as an optional language so OpenID can pick that.
+    // Save Portuguese, Brazil as an optional language. The process should pick
+    // 'pt-br' based on the sreg.language later.
     $language = (object) array(
       'langcode' => 'pt-br',
     );
@@ -659,8 +668,8 @@ class OpenIDRegistrationTestCase extends OpenIDWebTestCase {
       'openid.ext123.value.language' => 'pt-PT',
     ));
 
-    // Save Portuguese and Portuguese, Portugal as optional languages so
-    // OpenID can pick the right one.
+    // Save Portuguese and Portuguese, Portugal as optional languages. The
+    // process should pick 'pt-pt' as the more specific language.
     $language = (object) array(
       'langcode' => 'pt',
     );