diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index 3f5df08971a0..85eaddb6685c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -25,6 +25,7 @@
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.function.Executable;
 import org.junit.jupiter.api.function.ThrowingSupplier;
+import org.junit.platform.commons.util.StringUtils;
 import org.opentest4j.MultipleFailuresError;
 
 /**
@@ -135,6 +136,9 @@ public static <V> V fail() {
 	 * }</pre>
 	 */
 	public static <V> V fail(String message) {
+		if (StringUtils.isBlank(message)) {
+			AssertionUtils.fail("Assertion.fail() called");
+		}
 		AssertionUtils.fail(message);
 		return null; // appeasing the compiler: this line will never be executed.
 	}
@@ -147,6 +151,9 @@ public static <V> V fail(String message) {
 	 * generic return type {@code V}.
 	 */
 	public static <V> V fail(String message, Throwable cause) {
+		if (StringUtils.isBlank(message)) {
+			AssertionUtils.fail("Assertion.fail() called", cause);
+		}
 		AssertionUtils.fail(message, cause);
 		return null; // appeasing the compiler: this line will never be executed.
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
index 95db2c35ccaa..d1fd300b59ed 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionTestUtils.assertEmptyMessage;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageContains;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals;
 import static org.junit.jupiter.api.AssertionTestUtils.expectAssertionFailedError;
@@ -36,7 +35,7 @@ void failWithoutArgument() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertEmptyMessage(ex);
+			assertMessageEquals(ex, "Assertion.fail() called");
 		}
 	}
 
@@ -69,7 +68,7 @@ void failWithNullString() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertEmptyMessage(ex);
+			assertMessageEquals(ex, "Assertion.fail() called");
 		}
 	}
 
@@ -80,7 +79,7 @@ void failWithNullMessageSupplier() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertEmptyMessage(ex);
+			assertMessageEquals(ex, "Assertion.fail() called");
 		}
 	}
 
@@ -104,7 +103,7 @@ void failWithThrowable() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertEmptyMessage(ex);
+			assertMessageEquals(ex, "Assertion.fail() called");
 			Throwable cause = ex.getCause();
 			assertMessageContains(cause, "cause");
 		}
@@ -131,7 +130,7 @@ void failWithNullStringAndThrowable() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertEmptyMessage(ex);
+			assertMessageEquals(ex, "Assertion.fail() called");
 			Throwable cause = ex.getCause();
 			assertMessageContains(cause, "cause");
 		}
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
index 2b1311232187..315874cbf839 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
@@ -10,7 +10,6 @@
 package org.junit.jupiter.api
 
 import org.junit.jupiter.api.AssertEquals.assertEquals
-import org.junit.jupiter.api.AssertionTestUtils.assertEmptyMessage
 import org.junit.jupiter.api.AssertionTestUtils.assertMessageContains
 import org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals
 import org.opentest4j.AssertionFailedError
@@ -43,7 +42,7 @@ class KotlinFailAssertionsTests {
             assertThrows<AssertionFailedError> {
                 fail(null as String?)
             }
-        assertEmptyMessage(ex)
+        assertMessageEquals(ex, "Assertion.fail() called")
     }
 
     @Test
@@ -52,7 +51,7 @@ class KotlinFailAssertionsTests {
             assertThrows<AssertionFailedError> {
                 fail(null as (() -> String)?)
             }
-        assertEmptyMessage(ex)
+        assertMessageEquals(ex, "Assertion.fail() called")
     }
 
     @Test
@@ -75,7 +74,7 @@ class KotlinFailAssertionsTests {
             assertThrows<AssertionFailedError> {
                 fail(Throwable(throwableCause))
             }
-        assertEmptyMessage(ex)
+        assertMessageEquals(ex, "Assertion.fail() called")
         val cause = ex.cause
         assertMessageContains(cause, throwableCause)
     }
@@ -100,7 +99,7 @@ class KotlinFailAssertionsTests {
             assertThrows<AssertionFailedError> {
                 fail(null, Throwable(throwableCause))
             }
-        assertEmptyMessage(ex)
+        assertMessageEquals(ex, "Assertion.fail() called")
         val cause = ex.cause
         assertMessageContains(cause, throwableCause)
     }
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
index 740df190eaaa..b5fdb7af561d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
@@ -62,7 +62,7 @@ public static ReportEntry from(Map<String, String> keyValuePairs) {
 	/**
 	 * Factory for creating a new {@code ReportEntry} from a key-value pair.
 	 *
-	 * @param key the key under which the value should published; never
+	 * @param key the key under which the value should be published; never
 	 * {@code null} or blank
 	 * @param value the value to publish; never {@code null} or blank
 	 */