diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java
index 524e1ea3ba..781ca3726c 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java
@@ -37,9 +37,7 @@ import static org.junit.Assert.*;
 
 /**
  * Unit tests for {@link DefaultControllerSpec}.
- *
  * @author Rossen Stoyanchev
- * @since 5.0
  */
 public class DefaultControllerSpecTests {
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java
index 44cf7c37f2..746840143f 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java
@@ -38,10 +38,8 @@ import static org.mockito.Mockito.*;
 
 /**
  * Unit tests for {@link HeaderAssertions}.
- *
  * @author Rossen Stoyanchev
  * @author Sam Brannen
- * @since 5.0
  */
 public class HeaderAssertionTests {
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java
index 3278aedfca..2afa9386d6 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java
@@ -45,9 +45,7 @@ import static org.junit.Assert.assertEquals;
 
 /**
  * Unit tests for {@link HttpHandlerConnector}.
- *
  * @author Rossen Stoyanchev
- * @since 5.0
  */
 public class HttpHandlerConnectorTests {
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java
index a570580cd6..cd63b3c812 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java
@@ -32,9 +32,7 @@ import static org.mockito.Mockito.*;
 
 /**
  * Unit tests for {@link StatusAssertions}.
- *
  * @author Rossen Stoyanchev
- * @since 5.0
  */
 public class StatusAssertionTests {
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/WebTestClientConnectorTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java
similarity index 98%
rename from spring-test/src/test/java/org/springframework/test/web/reactive/server/WebTestClientConnectorTests.java
rename to spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java
index 3f84cea5ea..60f3fb979c 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/WebTestClientConnectorTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
  * @author Rossen Stoyanchev
  * @since 5.0
  */
-public class WebTestClientConnectorTests {
+public class WiretapConnectorTests {
 
 	@Test
 	public void captureAndClaim() {
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java
index 026a8e5e9a..a389bf647e 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,13 +60,13 @@ public class HttpServerTests {
 	}
 
 	@After
-	public void tearDown() throws Exception {
+	public void tearDown() {
 		this.server.stop();
 	}
 
 
 	@Test
-	public void test() throws Exception {
+	public void test() {
 		this.client.get().uri("/test")
 				.exchange()
 				.expectStatus().isOk()