diff -u b/core/modules/openid/config/openid.settings.yml b/core/modules/openid/config/openid.settings.yml
--- b/core/modules/openid/config/openid.settings.yml
+++ b/core/modules/openid/config/openid.settings.yml
@@ -2 +2 @@
-  http://xri.net/
\ No newline at end of file
+  http://xri.net/
diff -u b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDFunctionalTest.php b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDFunctionalTest.php
--- b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDFunctionalTest.php
+++ b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDFunctionalTest.php
@@ -88,9 +88,9 @@
     $this->addIdentity(url('openid-test/yadis/http-equiv', array('absolute' => TRUE)), 2);
 
     // Identifier is an XRI. Resolve using our own dummy proxy resolver.
-    $config = config('openid.settings');
-    $config->set('xri_proxy_resolver', url('openid-test/yadis/xrds/xri', array('absolute' => TRUE)) . '/');
-    $config->save();
+    config('openid.settings')
+      ->set('xri_proxy_resolver', url('openid-test/yadis/xrds/xri', array('absolute' => TRUE)) . '/')
+      ->save();
     $this->addIdentity('@example*résumé;%25', 2, 'http://example.com/xrds', 'http://example.com/user');
 
     // Make sure that unverified CanonicalID are not trusted.