diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index b7a382c881..21c9ad7c5d 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -478,7 +478,7 @@ EOF
 
 test_expect_success !WITH_BREAKING_CHANGES 'whatchanged needs --i-still-use-this' '
 	test_must_fail git whatchanged >message 2>&1 &&
-	test_grep "nominated for removal" message
+	test_grep "will be removed soon" message
 '
 
 test_expect_success 'log -m matches pure log' '
diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
index 2d96afd6f7..aff0bce099 100755
--- a/t/t5323-pack-redundant.sh
+++ b/t/t5323-pack-redundant.sh
@@ -47,7 +47,7 @@ shared_repo=shared.git
 
 test_expect_success 'pack-redundant needs --i-still-use-this' '
 	test_must_fail git pack-redundant >message 2>&1 &&
-	test_grep "nominated for removal" message
+	test_grep "will be removed soon" message
 '
 
 git_pack_redundant='git pack-redundant --i-still-use-this'
diff --git a/usage.c b/usage.c
index 3f0118ab2a..4449046c1a 100644
--- a/usage.c
+++ b/usage.c
@@ -386,21 +386,19 @@ NORETURN void you_still_use_that(const char *command_name, const char *hint)
 				 STRBUF_ENCODE_SLASH);
 
 	fprintf(stderr,
-		_("'%s' is nominated for removal.\n"), command_name);
+		_("'%s' will be removed soon.\n"), command_name);
 
 	if (hint)
 		fputs(hint, stderr);
 
 	fprintf(stderr,
-		_("If you still use this command, here's what you can do:\n"
+		_("If you need a replacement:\n"
 		  "\n"
-		  "- read https://git-scm.com/docs/BreakingChanges.html\n"
-		  "- check if anyone has discussed this on the mailing\n"
-		  "  list and if they came up with something that can\n"
-		  "  help you: https://lore.kernel.org/git/?q=%s\n"
-		  "- send an email to <git@vger.kernel.org> to let us\n"
-		  "  know that you still use this command and were unable\n"
-		  "  to determine a suitable replacement\n"
+		  "- Read https://git-scm.com/docs/BreakingChanges.html.\n\n"
+		  "- Check what others on the mailing list suggest as a replacement:\n"
+		  "  https://lore.kernel.org/git/?q=%s\n\n"
+		  "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+		  "  suggestions by others do not work for you.\n"
 		  "\n"),
 		percent_encoded.buf);
 	strbuf_release(&percent_encoded);