#include <bpf/btf.h>
 #include "test_bpf_cookie.skel.h"
 #include "kprobe_multi.skel.h"
+#include "uprobe_multi.skel.h"
 
 /* uprobe attach point */
 static noinline void trigger_func(void)
        bpf_link__destroy(link1);
        kprobe_multi__destroy(skel);
 }
+
+/* defined in prog_tests/uprobe_multi_test.c */
+void uprobe_multi_func_1(void);
+void uprobe_multi_func_2(void);
+void uprobe_multi_func_3(void);
+
+static void uprobe_multi_test_run(struct uprobe_multi *skel)
+{
+       skel->bss->uprobe_multi_func_1_addr = (__u64) uprobe_multi_func_1;
+       skel->bss->uprobe_multi_func_2_addr = (__u64) uprobe_multi_func_2;
+       skel->bss->uprobe_multi_func_3_addr = (__u64) uprobe_multi_func_3;
+
+       skel->bss->pid = getpid();
+       skel->bss->test_cookie = true;
+
+       uprobe_multi_func_1();
+       uprobe_multi_func_2();
+       uprobe_multi_func_3();
+
+       ASSERT_EQ(skel->bss->uprobe_multi_func_1_result, 1, "uprobe_multi_func_1_result");
+       ASSERT_EQ(skel->bss->uprobe_multi_func_2_result, 1, "uprobe_multi_func_2_result");
+       ASSERT_EQ(skel->bss->uprobe_multi_func_3_result, 1, "uprobe_multi_func_3_result");
+
+       ASSERT_EQ(skel->bss->uretprobe_multi_func_1_result, 1, "uretprobe_multi_func_1_result");
+       ASSERT_EQ(skel->bss->uretprobe_multi_func_2_result, 1, "uretprobe_multi_func_2_result");
+       ASSERT_EQ(skel->bss->uretprobe_multi_func_3_result, 1, "uretprobe_multi_func_3_result");
+}
+
+static void uprobe_multi_attach_api_subtest(void)
+{
+       struct bpf_link *link1 = NULL, *link2 = NULL;
+       struct uprobe_multi *skel = NULL;
+       LIBBPF_OPTS(bpf_uprobe_multi_opts, opts);
+       const char *syms[3] = {
+               "uprobe_multi_func_1",
+               "uprobe_multi_func_2",
+               "uprobe_multi_func_3",
+       };
+       __u64 cookies[3];
+
+       cookies[0] = 3; /* uprobe_multi_func_1 */
+       cookies[1] = 1; /* uprobe_multi_func_2 */
+       cookies[2] = 2; /* uprobe_multi_func_3 */
+
+       opts.syms = syms;
+       opts.cnt = ARRAY_SIZE(syms);
+       opts.cookies = &cookies[0];
+
+       skel = uprobe_multi__open_and_load();
+       if (!ASSERT_OK_PTR(skel, "uprobe_multi"))
+               goto cleanup;
+
+       link1 = bpf_program__attach_uprobe_multi(skel->progs.uprobe, -1,
+                                                "/proc/self/exe", NULL, &opts);
+       if (!ASSERT_OK_PTR(link1, "bpf_program__attach_uprobe_multi"))
+               goto cleanup;
+
+       cookies[0] = 2; /* uprobe_multi_func_1 */
+       cookies[1] = 3; /* uprobe_multi_func_2 */
+       cookies[2] = 1; /* uprobe_multi_func_3 */
+
+       opts.retprobe = true;
+       link2 = bpf_program__attach_uprobe_multi(skel->progs.uretprobe, -1,
+                                                     "/proc/self/exe", NULL, &opts);
+       if (!ASSERT_OK_PTR(link2, "bpf_program__attach_uprobe_multi_retprobe"))
+               goto cleanup;
+
+       uprobe_multi_test_run(skel);
+
+cleanup:
+       bpf_link__destroy(link2);
+       bpf_link__destroy(link1);
+       uprobe_multi__destroy(skel);
+}
+
 static void uprobe_subtest(struct test_bpf_cookie *skel)
 {
        DECLARE_LIBBPF_OPTS(bpf_uprobe_opts, opts);
                kprobe_multi_attach_api_subtest();
        if (test__start_subtest("uprobe"))
                uprobe_subtest(skel);
+       if (test__start_subtest("multi_uprobe_attach_api"))
+               uprobe_multi_attach_api_subtest();
        if (test__start_subtest("tracepoint"))
                tp_subtest(skel);
        if (test__start_subtest("perf_event"))