diff --git a/src/docs/asciidoc/testing-webtestclient.adoc b/src/docs/asciidoc/testing-webtestclient.adoc
index 17a17cfc96..f8f20cc329 100644
--- a/src/docs/asciidoc/testing-webtestclient.adoc
+++ b/src/docs/asciidoc/testing-webtestclient.adoc
@@ -1,17 +1,17 @@
 [[webtestclient]]
 = WebTestClient
 
-`WebTestClient` is a non-blocking, reactive client for testing web servers. It uses
-the reactive <<web-reactive.adoc#webflux-webclient, WebClient>> internally to perform
-requests and provides a fluent API to verify responses. The `WebTestClient` can connect
-to any server over an HTTP connection. It can also bind directly to WebFlux applications
-with <<testing.adoc#mock-objects-web-reactive,mock request and response>> objects,
-without the need for an HTTP server.
+`WebTestClient` is a thin shell around <<web-reactive.adoc#webflux-webclient, WebClient>>,
+using it to perform requests and exposing a dedicated, fluent API for verifying responses.
+`WebTestClient` bind to a WebFlux application using a
+<<testing.adoc#mock-objects-web-reactive,mock request and response>>, or it can test any
+web server over an HTTP connection.
+
 
 [TIP]
 ====
-Kotlin users, please see <<languages.adoc#kotlin-webtestclient-issue,this section>> for
-important information on using the `WebTestClient` in Kotlin.
+Kotlin users, please see <<languages.adoc#kotlin-webtestclient-issue,this section>>
+related to use of the `WebTestClient`.
 ====
 
 
@@ -20,8 +20,8 @@ important information on using the `WebTestClient` in Kotlin.
 == Setup
 
 To create a `WebTestClient` you must choose one of several server setup options.
-Effectively you either configure a WebFlux application to bind to, or use absolute URLs
-to connect to a running server.
+Effectively you're either configuring the WebFlux application to bind to, or using
+a URL to connect to a running server.
 
 
 
diff --git a/src/docs/asciidoc/web/webflux-webclient.adoc b/src/docs/asciidoc/web/webflux-webclient.adoc
index 8d49c6af9a..393fd2ac47 100644
--- a/src/docs/asciidoc/web/webflux-webclient.adoc
+++ b/src/docs/asciidoc/web/webflux-webclient.adoc
@@ -1,25 +1,29 @@
 [[webflux-client]]
 = WebClient
 
-The `spring-webflux` module includes a non-blocking, reactive client for HTTP requests
-with Reactive Streams back pressure. It shares
-<<web-reactive.adoc#webflux-codecs,HTTP codecs>> and other infrastructure with the
+The `spring-webflux` module includes a reactive, non-blocking client for HTTP requests
+with a functional-style API client and Reactive Streams support. `WebClient` depends on a
+lower level HTTP client library to execute requests and that support is pluggable.
+
+`WebClient`
+uses the same <<web-reactive.adoc#webflux-codecs,codecs>> as WebFlux server applications do, and
+shares a common base package, some common APIs, and infrastructure with the
 server <<web-reactive.adoc#webflux-fn,functional web framework>>.
+The API exposes Reactor `Flux` and `Mono` types, also see
+<<web-reactive.adoc#webflux-reactive-libraries>>. By default it uses
+it uses https://github.com/reactor/reactor-netty[Reactor Netty] as the HTTP client
+library but others can be plugged in through a custom `ClientHttpConnector`.
 
-`WebClient` provides a higher level API over HTTP client libraries. By default
-it uses https://github.com/reactor/reactor-netty[Reactor Netty] but that is pluggable
-with a different `ClientHttpConnector`. The `WebClient` API returns Reactor `Flux` or
-`Mono` for output and accepts Reactive Streams `Publisher` as input (see
-<<web-reactive.adoc#webflux-reactive-libraries>>).
+By comparison to the <<integration.adoc#rest-resttemplate,RestTemplate>>, the
+`WebClient` is:
 
-[TIP]
-====
-By comparison to the
-<<integration.adoc#rest-resttemplate,RestTemplate>>, the `WebClient` offers a more
-functional and fluent API that taking full advantage of Java 8 lambdas. It supports both
-sync and async scenarios, including streaming, and brings the efficiency of
-non-blocking I/O.
-====
+* non-blocking, reactive, and supports higher concurrency with less hardware resources.
+* provides a functional API that takes advantage of Java 8 lambdas.
+* supports both synchronous and asynchronous scenarios.
+* supports streaming up or down from a server.
+
+For most concurrent scenarios, e.g. a sequence of possibly inter-dependent HTTP calls,
+or for making remote calls from the server-side, prefer using the `WebClient`.
 
 
 
@@ -336,3 +340,17 @@ You can also mutate an existing `WebClient` instance without affecting the origi
 			.filter(basicAuthentication("user", "pwd")
 			.build();
 ----
+
+
+
+
+[[webflux-client-testing]]
+== Testing
+
+To test code that uses the `WebClient`, you can use a mock web server such as the
+https://github.com/square/okhttp#mockwebserver[OkHttp MockWebServer]. To see example
+use, check
+https://github.com/spring-projects/spring-framework/blob/master/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java[WebClientIntegrationTests]
+in the Spring Framework tests, or the
+https://github.com/square/okhttp/tree/master/samples/static-server[static-server]
+sample in the OkHttp repository.