diff --git a/tests/builder/subcommands.rs b/tests/builder/subcommands.rs
index 836102eeb2de..d2477c17d002 100644
--- a/tests/builder/subcommands.rs
+++ b/tests/builder/subcommands.rs
@@ -573,7 +573,12 @@ For more information try help
     utils::assert_eq(HELLO_EXPECTED, err.to_string());
 
     let err = cmd.clone().try_get_matches_from(&["baz"]).unwrap_err();
-    assert_eq!(err.kind(), ErrorKind::InvalidSubcommand);
+    assert!(
+        err.kind() == ErrorKind::InvalidSubcommand
+            || err.kind() == ErrorKind::UnrecognizedSubcommand,
+        "err.kind()={:?}",
+        err.kind()
+    );
     static BAZ_EXPECTED: &str = "\
 error: The subcommand 'baz' wasn't recognized