diff --git a/acceptance/tests/ticket_17458_puppet_command_prints_help.rb b/acceptance/tests/ticket_17458_puppet_command_prints_help.rb
new file mode 100644
index 000000000..3ba5a31b5
--- /dev/null
+++ b/acceptance/tests/ticket_17458_puppet_command_prints_help.rb
@@ -0,0 +1,5 @@
+test_name "puppet command with an unknown external command prints help"
+
+on agents, puppet('unknown') do
+  assert_match(/See 'puppet help' for help on available puppet subcommands/, stdout)
+end