2 files changed, 4 insertions, 3 deletions

diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index 8739a1345017..35f43fd7a38b 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -143,7 +143,7 @@ __perf_main ()
                 __perfcomp_colon "$evts" "$cur"
         else
                 # List subcommands for perf commands
-                if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|data|help|script) ]]; then
+                if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|data|help|script|test) ]]; then
                         subcmds=$($cmd $prev_skip_opts --list-cmds)
                         __perfcomp_colon "$subcmds" "$cur"
                 fi
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 4b7d9ab0f049..ed8e05c6839a 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -291,7 +291,7 @@ static int perf_test__list(int argc, const char **argv)
 
 int cmd_test(int argc, const char **argv, const char *prefix __maybe_unused)
 {
-        const char * const test_usage[] = {
+        const char *test_usage[] = {
         "perf test [<options>] [{list <test-name-fragment>|[<test-name-fragments>|<test-numbers>]}]",
         NULL,
         };
@@ -302,13 +302,14 @@ int cmd_test(int argc, const char **argv, const char *prefix __maybe_unused)
                     "be more verbose (show symbol address, etc)"),
         OPT_END()
         };
+        const char * const test_subcommands[] = { "list", NULL };
         struct intlist *skiplist = NULL;
         int ret = hists__init();
 
         if (ret < 0)
                 return ret;
 
-        argc = parse_options(argc, argv, test_options, test_usage, 0);
+        argc = parse_options_subcommand(argc, argv, test_options, test_subcommands, test_usage, 0);
         if (argc >= 1 && !strcmp(argv[0], "list"))
                 return perf_test__list(argc, argv);