diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
index e413176890..90eefc1266 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
@@ -119,7 +119,8 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
 				org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE);
 		assertThat(adapted.getRedirectUriTemplate())
 				.isEqualTo("{baseUrl}/login/oauth2/code/{registrationId}");
-		assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email");
+		assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email",
+				"address", "phone");
 		assertThat(adapted.getClientName()).isEqualTo("Google");
 	}
 
@@ -202,7 +203,8 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
 				org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE);
 		assertThat(adapted.getRedirectUriTemplate())
 				.isEqualTo("{baseUrl}/login/oauth2/code/{registrationId}");
-		assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email");
+		assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email",
+				"address", "phone");
 		assertThat(adapted.getClientName()).isEqualTo("Google");
 	}
 
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 12268fe850..35aed55a13 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -154,7 +154,7 @@
 		<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
 		<spring-restdocs.version>2.0.0.RELEASE</spring-restdocs.version>
 		<spring-retry.version>1.2.2.RELEASE</spring-retry.version>
-		<spring-security.version>5.0.1.BUILD-SNAPSHOT</spring-security.version>
+		<spring-security.version>5.0.0.RELEASE</spring-security.version>
 		<spring-session.version>2.0.0.RC2</spring-session.version>
 		<spring-session-data-mongodb.version>2.0.0.RC2</spring-session-data-mongodb.version>
 		<spring-ws.version>3.0.0.RELEASE</spring-ws.version>