diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
index 20963b87791..8b38c3f2f9e 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
@@ -79,10 +79,12 @@ public abstract class ExchangeFilterFunctions {
 	 * Return a filter that applies HTTP Basic Authentication to the request
 	 * headers via {@link HttpHeaders#setBasicAuth(String)} and
 	 * {@link HttpHeaders#encodeBasicAuth(String, String, Charset)}.
-	 * <p>{@linkplain StandardCharsets#ISO_8859_1 ISO-8859-1} is used to convert the credentials into an octet sequence.
+	 * <p>{@linkplain StandardCharsets#ISO_8859_1 ISO-8859-1} is used to convert
+	 * the credentials into an octet sequence.
 	 * @param username the username
 	 * @param password the password
 	 * @return the filter to add authentication headers with
+	 * @see #basicAuthentication(String, String, Charset)
 	 * @see HttpHeaders#encodeBasicAuth(String, String, Charset)
 	 * @see HttpHeaders#setBasicAuth(String)
 	 */
@@ -100,6 +102,7 @@ public abstract class ExchangeFilterFunctions {
 	 * sequence. Defaults to {@linkplain StandardCharsets#ISO_8859_1 ISO-8859-1}.
 	 * @return the filter to add authentication headers with
 	 * @since 7.0.8
+	 * @see #basicAuthentication(String, String)
 	 * @see HttpHeaders#encodeBasicAuth(String, String, Charset)
 	 * @see HttpHeaders#setBasicAuth(String)
 	 */
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java
index 136660d2a46..39d455d0138 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java
@@ -115,7 +115,7 @@ class ExchangeFilterFunctionsTests {
 		assertThat(result).isEqualTo(response);
 	}
 
-	@Test
+	@Test  // gh-36777
 	void basicAuthenticationUsernameAndUnicodePassword() {
 		ClientRequest request = ClientRequest.create(HttpMethod.GET, DEFAULT_URL).build();
 		ClientResponse response = mock();