diff --git a/spring-boot-samples/spring-boot-sample-oauth2-client/src/main/resources/application.yml b/spring-boot-samples/spring-boot-sample-oauth2-client/src/main/resources/application.yml
index e0a70da4e0..1a7bd711b3 100644
--- a/spring-boot-samples/spring-boot-sample-oauth2-client/src/main/resources/application.yml
+++ b/spring-boot-samples/spring-boot-sample-oauth2-client/src/main/resources/application.yml
@@ -17,9 +17,9 @@ spring:
             provider: github
             scope: user:email
             redirect-uri-template: http://localhost:8080/login/oauth2/code/github
-          google-oidc:
-            client-id: ${GOOGLE-CLIENT-ID}
-            client-secret: ${GOOGLE-CLIENT-SECRET}
+          yahoo-oidc:
+            client-id: ${YAHOO-CLIENT-ID}
+            client-secret: ${YAHOO-CLIENT-SECRET}
         provider:
-          google-oidc:
-            issuer-uri: https://accounts.google.com
\ No newline at end of file
+          yahoo-oidc:
+            issuer-uri: https://api.login.yahoo.com/
\ No newline at end of file
diff --git a/spring-boot-samples/spring-boot-sample-oauth2-client/src/test/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java b/spring-boot-samples/spring-boot-sample-oauth2-client/src/test/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java
index f286cddbac..0c04fabb2f 100644
--- a/spring-boot-samples/spring-boot-sample-oauth2-client/src/test/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-oauth2-client/src/test/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java
@@ -34,8 +34,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
 		"APP-CLIENT-ID=my-client-id", "APP-CLIENT-SECRET=my-client-secret",
-		"GOOGLE-CLIENT-ID=my-google-client-id",
-		"GOOGLE-CLIENT-SECRET=my-google-client-secret" })
+		"YAHOO-CLIENT-ID=my-yahoo-client-id",
+		"YAHOO-CLIENT-SECRET=my-yahooo-client-secret" })
 public class SampleOAuth2ClientApplicationTests {
 
 	@LocalServerPort
@@ -57,7 +57,7 @@ public class SampleOAuth2ClientApplicationTests {
 		ResponseEntity<String> entity = this.restTemplate.getForEntity("/login",
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
-		assertThat(entity.getBody()).contains("/oauth2/authorization/google");
+		assertThat(entity.getBody()).contains("/oauth2/authorization/yahoo");
 		assertThat(entity.getBody()).contains("/oauth2/authorization/github-client-1");
 		assertThat(entity.getBody()).contains("/oauth2/authorization/github-client-2");
 	}
diff --git a/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml b/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml
index e0a70da4e0..1a7bd711b3 100644
--- a/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml
+++ b/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml
@@ -17,9 +17,9 @@ spring:
             provider: github
             scope: user:email
             redirect-uri-template: http://localhost:8080/login/oauth2/code/github
-          google-oidc:
-            client-id: ${GOOGLE-CLIENT-ID}
-            client-secret: ${GOOGLE-CLIENT-SECRET}
+          yahoo-oidc:
+            client-id: ${YAHOO-CLIENT-ID}
+            client-secret: ${YAHOO-CLIENT-SECRET}
         provider:
-          google-oidc:
-            issuer-uri: https://accounts.google.com
\ No newline at end of file
+          yahoo-oidc:
+            issuer-uri: https://api.login.yahoo.com/
\ No newline at end of file
diff --git a/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/test/java/sample/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java b/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/test/java/sample/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java
index 66fce8a191..506f3d0937 100644
--- a/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/test/java/sample/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/test/java/sample/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java
@@ -29,8 +29,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
 		"APP-CLIENT-ID=my-client-id", "APP-CLIENT-SECRET=my-client-secret",
-		"GOOGLE-CLIENT-ID=my-google-client-id",
-		"GOOGLE-CLIENT-SECRET=my-google-client-secret" })
+		"YAHOO-CLIENT-ID=my-google-client-id",
+		"YAHOO-CLIENT-SECRET=my-google-client-secret" })
 public class SampleReactiveOAuth2ClientApplicationTests {
 
 	@Autowired
@@ -47,7 +47,7 @@ public class SampleReactiveOAuth2ClientApplicationTests {
 		byte[] body = this.webTestClient.get().uri("/login").exchange().expectStatus()
 				.isOk().returnResult(String.class).getResponseBodyContent();
 		String bodyString = new String(body);
-		assertThat(bodyString).contains("/oauth2/authorization/google");
+		assertThat(bodyString).contains("/oauth2/authorization/yahoo");
 		assertThat(bodyString).contains("/oauth2/authorization/github-client-1");
 		assertThat(bodyString).contains("/oauth2/authorization/github-client-2");
 	}