diff --git a/release-tools/src/test/java/org/springframework/data/release/build/MavenPropertiesUnitTests.java b/release-tools/src/test/java/org/springframework/data/release/build/MavenPropertiesUnitTests.java
index aae5daf..489fbe3 100644
--- a/release-tools/src/test/java/org/springframework/data/release/build/MavenPropertiesUnitTests.java
+++ b/release-tools/src/test/java/org/springframework/data/release/build/MavenPropertiesUnitTests.java
@@ -38,28 +38,19 @@ class MavenPropertiesUnitTests {
 		this.properties.setPlugins(Collections.singletonMap("versions", "org.codehaus.mojo:versions-maven-plugin:2.2"));
 	}
 
-	/**
-	 * @see #8
-	 */
-	@Test
+	@Test // #8
 	void expandsGoalsCorrectly() {
 
 		assertThat(properties.getFullyQualifiedPlugin("versions:set"))
 				.isEqualTo("org.codehaus.mojo:versions-maven-plugin:2.2:set");
 	}
 
-	/**
-	 * @see #8
-	 */
-	@Test
+	@Test // #8
 	void doesNotExpandGoalStartingWithDash() {
 		assertThat(properties.getFullyQualifiedPlugin("-versions:set")).isEqualTo("-versions:set");
 	}
 
-	/**
-	 * @see #8
-	 */
-	@Test
+	@Test // #8
 	void doesNotExpandGoalWithoutColon() {
 		assertThat(properties.getFullyQualifiedPlugin("versions-set")).isEqualTo("versions-set");
 	}
diff --git a/release-tools/src/test/java/org/springframework/data/release/build/UpdateInformationUnitTests.java b/release-tools/src/test/java/org/springframework/data/release/build/UpdateInformationUnitTests.java
index e2af131..16ee9e2 100644
--- a/release-tools/src/test/java/org/springframework/data/release/build/UpdateInformationUnitTests.java
+++ b/release-tools/src/test/java/org/springframework/data/release/build/UpdateInformationUnitTests.java
@@ -74,10 +74,7 @@ class UpdateInformationUnitTests {
 		assertThat(updateInformation.getProjectVersionToSet(Projects.JPA).toString()).isEqualTo("1.10.0.BUILD-SNAPSHOT");
 	}
 
-	/**
-	 * @see #22
-	 */
-	@Test
+	@Test // #22
 	void returnsCorrectReleaseTrainVersions() {
 
 		TrainIteration hopperGa = new TrainIteration(ReleaseTrains.HOPPER, Iteration.GA);
diff --git a/release-tools/src/test/java/org/springframework/data/release/git/BackportTargetsUnitTests.java b/release-tools/src/test/java/org/springframework/data/release/git/BackportTargetsUnitTests.java
index 81bca48..8d5e55b 100644
--- a/release-tools/src/test/java/org/springframework/data/release/git/BackportTargetsUnitTests.java
+++ b/release-tools/src/test/java/org/springframework/data/release/git/BackportTargetsUnitTests.java
@@ -38,10 +38,7 @@ class BackportTargetsUnitTests {
 	Branch goslingBranch = getBranch(ReleaseTrains.GOSLING);
 	Branch fowlerBranch = getBranch(ReleaseTrains.FOWLER);
 
-	/**
-	 * @see #11
-	 */
-	@Test
+	@Test // #11
 	void returnsModuleBranchesForTrains() {
 
 		TrainIteration iteration = new TrainIteration(ReleaseTrains.HOPPER, Iteration.M1);
@@ -53,10 +50,7 @@ class BackportTargetsUnitTests {
 		assertThat(targets).contains(goslingBranch, fowlerBranch);
 	}
 
-	/**
-	 * @see #11
-	 */
-	@Test
+	@Test // #11
 	void includesMasterBranchForServiceReleaseSource() {
 
 		TrainIteration iteration = new TrainIteration(ReleaseTrains.GOSLING, Iteration.SR2);
diff --git a/release-tools/src/test/java/org/springframework/data/release/git/BranchUnitTests.java b/release-tools/src/test/java/org/springframework/data/release/git/BranchUnitTests.java
index f187d67..41cceda 100644
--- a/release-tools/src/test/java/org/springframework/data/release/git/BranchUnitTests.java
+++ b/release-tools/src/test/java/org/springframework/data/release/git/BranchUnitTests.java
@@ -44,10 +44,7 @@ class BranchUnitTests {
 		assertThat(Branch.from(iterationVersion).toString()).isEqualTo("1.4.x");
 	}
 
-	/**
-	 * @see #2
-	 */
-	@Test
+	@Test // #2
 	void detectsIssueBranches() {
 
 		Branch branch = Branch.from("issue/DATACMNS-4711");
diff --git a/release-tools/src/test/java/org/springframework/data/release/issues/github/GitHubIssueTrackerIntegrationTests.java b/release-tools/src/test/java/org/springframework/data/release/issues/github/GitHubIssueTrackerIntegrationTests.java
index 1af36cd..4b660ec 100644
--- a/release-tools/src/test/java/org/springframework/data/release/issues/github/GitHubIssueTrackerIntegrationTests.java
+++ b/release-tools/src/test/java/org/springframework/data/release/issues/github/GitHubIssueTrackerIntegrationTests.java
@@ -71,10 +71,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
 		github.reset();
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void findTicketsByTicketIds() {
 
 		mockGetIssueWith("issue.json", 233);
@@ -83,30 +80,21 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
 		assertThat(tickets).hasSize(1);
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void ignoresUnknownTicketsByTicketId() {
 
 		Collection<Ticket> tickets = github.findTickets(Projects.BUILD, Collections.singletonList("123"));
 		assertThat(tickets).hasSize(0);
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void emptyResultWithEmptyTicketIds() {
 
 		Collection<Ticket> tickets = github.findTickets(Projects.COMMONS, Collections.emptyList());
 		assertThat(tickets).hasSize(0);
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void getReleaseTicketForReturnsTheReleaseTicket() {
 
 		mockGetMilestonesWith("milestones.json");
@@ -116,10 +104,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
 		assertThat(releaseTicket.getId()).isEqualTo("#233");
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void noReleaseTicketFound() {
 
 		mockGetMilestonesWith("emptyMilestones.json");
@@ -128,10 +113,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
 				.withMessageContaining("No milestone for Spring Data Build found containing 1.8 RC1!");
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void createReleaseVersionShouldCreateAVersion() {
 
 		mockGetMilestonesWith("emptyMilestones.json");
@@ -143,10 +125,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
 				.withRequestBody(equalToJson("{\"title\":\"1.8 RC1 (Hopper)\", \"description\":\"Hopper RC1\"}")));
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void createReleaseVersionShouldFindExistingReleaseVersion() {
 
 		mockGetMilestonesWith("milestones.json");
@@ -156,10 +135,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
 		verify(0, postRequestedFor(urlPathMatching(MILESTONES_URI)));
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void createReleaseTicketShouldCreateReleaseTicket() {
 
 		mockGetMilestonesWith("milestones.json");
@@ -172,10 +148,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
 				.withRequestBody(equalToJson("{\"title\":\"Release 1.8 RC1 (Hopper)\",\"milestone\":45}")));
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void createReleaseTicketShouldFailWithNoReleaseVersion() {
 
 		ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.BUILD, Iteration.RC1);
@@ -187,10 +160,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
 				.withMessageContaining("No milestone for Spring Data Build found containing 1.8 RC1!");
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void createReleaseTicketShouldFindExistingTicket() {
 
 		mockGetMilestonesWith("milestones.json");
@@ -201,10 +171,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
 		verify(0, postRequestedFor(urlPathMatching(MILESTONES_URI)));
 	}
 
-	/**
-	 * @see #55
-	 */
-	@Test
+	@Test // #55
 	void assignTicketToMe() {
 
 		mockGetMilestonesWith("milestones.json");
@@ -219,10 +186,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
 				.withRequestBody(equalToJson("{\"assignees\":[\"dummy\"]}")));
 	}
 
-	/**
-	 * @see #94
-	 */
-	@Test
+	@Test // #94
 	void closeIterationShouldResolveReleaseTicket() {
 
 		mockGetMilestonesWith("milestones.json");
diff --git a/release-tools/src/test/java/org/springframework/data/release/issues/jira/JiraComponentsUnitTests.java b/release-tools/src/test/java/org/springframework/data/release/issues/jira/JiraComponentsUnitTests.java
index 8b48e2c..d020afa 100644
--- a/release-tools/src/test/java/org/springframework/data/release/issues/jira/JiraComponentsUnitTests.java
+++ b/release-tools/src/test/java/org/springframework/data/release/issues/jira/JiraComponentsUnitTests.java
@@ -28,10 +28,7 @@ import org.junit.jupiter.api.Test;
  */
 class JiraComponentsUnitTests {
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void returnsComponentByName() {
 
 		JiraComponent fooComponent = new JiraComponent("123", "foo");
@@ -40,10 +37,7 @@ class JiraComponentsUnitTests {
 		assertThat(jiraComponents.findComponent("foo").isPresent()).isTrue();
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void returnsEmptyIfComponentMissing() {
 
 		JiraComponent fooComponent = new JiraComponent("123", "foo");
@@ -52,10 +46,7 @@ class JiraComponentsUnitTests {
 		assertThat(jiraComponents.findComponent("baz").isPresent()).isFalse();
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void failsOnNullArgumentConstruction() {
 		assertThatIllegalArgumentException().isThrownBy(() -> JiraComponents.of(null));
 	}
diff --git a/release-tools/src/test/java/org/springframework/data/release/issues/jira/JiraConnectorIntegrationTests.java b/release-tools/src/test/java/org/springframework/data/release/issues/jira/JiraConnectorIntegrationTests.java
index 0865727..e15f447 100644
--- a/release-tools/src/test/java/org/springframework/data/release/issues/jira/JiraConnectorIntegrationTests.java
+++ b/release-tools/src/test/java/org/springframework/data/release/issues/jira/JiraConnectorIntegrationTests.java
@@ -76,10 +76,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 		jira.reset();
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void findResolvedTicketsByTicketIds() {
 
 		mockSearchWith("DATAREDIS-1andDATAJPA-1.json");
@@ -88,10 +85,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 		assertThat(tickets).hasSize(2);
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void ignoresUnknownTicketsByTicketId() {
 
 		mockSearchWith("emptyTickets.json");
@@ -100,20 +94,14 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 		assertThat(tickets).hasSize(0);
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void emptyResultWithEmptyTicketIds() {
 
 		Collection<Ticket> tickets = jira.findTickets(Projects.COMMONS, Arrays.asList());
 		assertThat(tickets).hasSize(0);
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void getReleaseTicketForReturnsTheReleaseTicket() {
 
 		mockSearchWith("releaseTickets.json");
@@ -122,10 +110,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 		assertThat(releaseTicket.getId()).isEqualTo("DATAREST-782");
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void noReleaseTicketFound() {
 
 		mockSearchWith("emptyTickets.json");
@@ -134,10 +119,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 				.withMessageContaining("Did not find a release ticket for Spring Data REST 2.5 RC1");
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void getReleaseVersion() {
 
 		mockGetProjectVersionsWith("releaseVersions.json", REST_HOPPER_RC1.getProjectKey());
@@ -148,10 +130,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 		assertThat(optional.get().getName()).isEqualTo("2.5 RC1 (Hopper)");
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void createReleaseVersionShouldCreateAVersion() {
 
 		mockGetProjectVersionsWith("emptyReleaseVersions.json", REST_HOPPER_RC1.getProjectKey());
@@ -163,10 +142,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 				"{\"name\":\"2.5 RC1 (Hopper)\",\"project\":\"DATAREST\",\"description\":\"Hopper RC1\", \"released\":false, \"archived\":false}")));
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void createReleaseVersionShouldFindExistingReleaseVersion() {
 
 		ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -178,10 +154,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 		verify(0, postRequestedFor(urlPathMatching(CREATE_VERSION_URI)));
 	}
 
-	/**
-	 * @see #56
-	 */
-	@Test
+	@Test // #56
 	void archiveReleaseVersionShouldArchiveReleaseVersion() {
 
 		ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -197,10 +170,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 						+ "\"description\":\"Hopper RC1\", \"released\":true,\"archived\":true}")));
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void createReleaseTicketShouldCreateReleaseTicket() {
 
 		ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -219,10 +189,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 						+ "\"components\":[{\"name\":\"Infrastructure\"}]}}")));
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void createReleaseTicketShouldCreateReleaseTicketWithoutComponent() {
 
 		ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -240,10 +207,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 						+ "\"fixVersions\":[{\"name\":\"2.5 RC1 (Hopper)\"}]}}")));
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void createReleaseTicketShouldFailWithNoReleaseVersion() {
 
 		ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -255,10 +219,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 				.withMessageContaining("Did not find a release version for Spring Data REST 2.5 RC1");
 	}
 
-	/**
-	 * @see #5
-	 */
-	@Test
+	@Test // #5
 	void createReleaseTicketShouldFindExistingTicket() {
 
 		ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -309,10 +270,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
 		verify(0, postRequestedFor(urlPathMatching("/rest/api/2/issue/DATACASS-302")));
 	}
 
-	/**
-	 * @see #94
-	 */
-	@Test
+	@Test // #94
 	void closeIterationShouldResolveReleaseTicket() {
 
 		ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
diff --git a/release-tools/src/test/java/org/springframework/data/release/model/ProjectUnitTests.java b/release-tools/src/test/java/org/springframework/data/release/model/ProjectUnitTests.java
index 7d034bf..50448cf 100644
--- a/release-tools/src/test/java/org/springframework/data/release/model/ProjectUnitTests.java
+++ b/release-tools/src/test/java/org/springframework/data/release/model/ProjectUnitTests.java
@@ -40,10 +40,7 @@ class ProjectUnitTests {
 		assertThat(projects.get(1)).isEqualTo(Projects.COMMONS);
 	}
 
-	/**
-	 * @see #28
-	 */
-	@Test
+	@Test // #28
 	void findsProjectByKey() {
 		assertThat(Projects.requiredByName("DATACMNS")).isEqualTo(Projects.COMMONS);
 	}