diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index af59fcac4c6..61cda20f495 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -22,7 +22,7 @@
 
 /**
  * {@code @CsvSource} is a special {@link ArgumentsSource} which reads
- * comma-separated values (CSV) from its {@link value} attribute.
+ * comma-separated values (CSV) from its {@link #value} attribute.
  *
  * <p>These values are then provided as arguments to {@code @ParameterizedTest}
  * methods using a {@code CsvArgumentsProvider}.
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
index 1e81ad9d9de..7a0889e2ee3 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
@@ -24,6 +24,7 @@
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ToStringBuilder;
 import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestDescriptor.Type;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.TestTag;
 
@@ -45,7 +46,7 @@ public final class TestIdentifier implements Serializable {
 	private final String legacyReportingName;
 	private final TestSource source;
 	private final Set<TestTag> tags;
-	private final TestDescriptor.Type type;
+	private final Type type;
 
 	/**
 	 * Factory for creating a new {@link TestIdentifier} from a {@link TestDescriptor}.
@@ -57,14 +58,14 @@ public static TestIdentifier from(TestDescriptor testDescriptor) {
 		String displayName = testDescriptor.getDisplayName();
 		TestSource source = testDescriptor.getSource().orElse(null);
 		Set<TestTag> tags = testDescriptor.getTags();
-		TestDescriptor.Type type = testDescriptor.getType();
+		Type type = testDescriptor.getType();
 		String parentId = testDescriptor.getParent().map(
 			parentDescriptor -> parentDescriptor.getUniqueId().toString()).orElse(null);
 		String legacyReportingName = testDescriptor.getLegacyReportingName();
 		return new TestIdentifier(uniqueId, displayName, source, tags, type, parentId, legacyReportingName);
 	}
 
-	TestIdentifier(String uniqueId, String displayName, TestSource source, Set<TestTag> tags, TestDescriptor.Type type,
+	TestIdentifier(String uniqueId, String displayName, TestSource source, Set<TestTag> tags, Type type,
 			String parentId, String legacyReportingName) {
 		Preconditions.notNull(type, "TestDescriptor.Type must not be null");
 		this.uniqueId = uniqueId;
@@ -139,7 +140,7 @@ public String getLegacyReportingName() {
 	 *
 	 * @return the underlying descriptor type; never {@code null}
 	 */
-	public TestDescriptor.Type getType() {
+	public Type getType() {
 		return type;
 	}
 
@@ -148,7 +149,7 @@ public TestDescriptor.Type getType() {
 	 *
 	 * @return {@code true} if the underlying descriptor type represents a test,
 	 * {@code false} otherwise
-	 * @see TestDescriptor.Type#isTest()
+	 * @see Type#isTest()
 	 */
 	public boolean isTest() {
 		return getType().isTest();
@@ -159,7 +160,7 @@ public boolean isTest() {
 	 *
 	 * @return {@code true} if the underlying descriptor type represents a container,
 	 * {@code false} otherwise
-	 * @see TestDescriptor.Type#isContainer()
+	 * @see Type#isContainer()
 	 */
 	public boolean isContainer() {
 		return getType().isContainer();