diff --git a/samples/bpf/test_cgrp2_sock.sh b/samples/bpf/test_cgrp2_sock.sh
index 9f617423685618fab136aaf41743578f1d4f2bd2..07a503edcba935a439f49a11f56f22437dc8b0ed 100755
--- a/samples/bpf/test_cgrp2_sock.sh
+++ b/samples/bpf/test_cgrp2_sock.sh
@@ -19,7 +19,7 @@ print_result()
 
 check_sock()
 {
-	out=$(test_cgrp2_sock)
+	out=$(./test_cgrp2_sock)
 	echo $out | grep -q "$1"
 	if [ $? -ne 0 ]; then
 		print_result 1 "IPv4: $2"
@@ -33,7 +33,7 @@ check_sock()
 
 check_sock6()
 {
-	out=$(test_cgrp2_sock -6)
+	out=$(./test_cgrp2_sock -6)
 	echo $out | grep -q "$1"
 	if [ $? -ne 0 ]; then
 		print_result 1 "IPv6: $2"
@@ -61,7 +61,7 @@ cleanup_and_exit()
 
 	[ -n "$msg" ] && echo "ERROR: $msg"
 
-	test_cgrp2_sock -d ${CGRP_MNT}/sockopts
+	./test_cgrp2_sock -d ${CGRP_MNT}/sockopts
 	ip li del cgrp2_sock
 	umount ${CGRP_MNT}
 
@@ -98,7 +98,7 @@ check_sock6 "dev , mark 0, priority 0" "No programs attached"
 
 # verify device is set
 #
-test_cgrp2_sock -b cgrp2_sock ${CGRP_MNT}/sockopts
+./test_cgrp2_sock -b cgrp2_sock ${CGRP_MNT}/sockopts
 if [ $? -ne 0 ]; then
 	cleanup_and_exit 1 "Failed to install program to set device"
 fi
@@ -107,7 +107,7 @@ check_sock6 "dev cgrp2_sock, mark 0, priority 0" "Device set"
 
 # verify mark is set
 #
-test_cgrp2_sock -m 666 ${CGRP_MNT}/sockopts
+./test_cgrp2_sock -m 666 ${CGRP_MNT}/sockopts
 if [ $? -ne 0 ]; then
 	cleanup_and_exit 1 "Failed to install program to set mark"
 fi
@@ -116,7 +116,7 @@ check_sock6 "dev , mark 666, priority 0" "Mark set"
 
 # verify priority is set
 #
-test_cgrp2_sock -p 123 ${CGRP_MNT}/sockopts
+./test_cgrp2_sock -p 123 ${CGRP_MNT}/sockopts
 if [ $? -ne 0 ]; then
 	cleanup_and_exit 1 "Failed to install program to set priority"
 fi
@@ -125,7 +125,7 @@ check_sock6 "dev , mark 0, priority 123" "Priority set"
 
 # all 3 at once
 #
-test_cgrp2_sock -b cgrp2_sock -m 666 -p 123 ${CGRP_MNT}/sockopts
+./test_cgrp2_sock -b cgrp2_sock -m 666 -p 123 ${CGRP_MNT}/sockopts
 if [ $? -ne 0 ]; then
 	cleanup_and_exit 1 "Failed to install program to set device, mark and priority"
 fi
diff --git a/samples/bpf/test_cgrp2_sock2.sh b/samples/bpf/test_cgrp2_sock2.sh
index 0f396a86e0cbebd68e9ddf2d5c8557ce40028f38..485531845a902a595af3c29c8b22178c61447307 100755
--- a/samples/bpf/test_cgrp2_sock2.sh
+++ b/samples/bpf/test_cgrp2_sock2.sh
@@ -23,13 +23,13 @@ function config_cgroup {
 
 
 function attach_bpf {
-	test_cgrp2_sock2 /tmp/cgroupv2/foo sock_flags_kern.o $1
+	./test_cgrp2_sock2 /tmp/cgroupv2/foo sock_flags_kern.o $1
 	[ $? -ne 0 ] && exit 1
 }
 
 function cleanup {
 	if [ -d /tmp/cgroupv2/foo ]; then
-		test_cgrp2_sock -d /tmp/cgroupv2/foo
+		./test_cgrp2_sock -d /tmp/cgroupv2/foo
 	fi
 	ip link del veth0b
 	ip netns delete at_ns0
diff --git a/tools/testing/selftests/bpf/samples_test.sh b/tools/testing/selftests/bpf/samples_test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d0a6659df46e12996a0fcc05ba2aba310895a264
--- /dev/null
+++ b/tools/testing/selftests/bpf/samples_test.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+yum install -y iperf3 netperf iproute-tc nmap-ncat readline
+
+cd ../../../../samples/bpf
+make -j8
+
+ulimit -l unlimited
+
+./fds_example -F /sys/fs/bpf/m -G -m -k 1
+./fds_example -F /sys/fs/bpf/m -G -m -k 1 -v 24
+./fds_example -F /sys/fs/bpf/m -G -m -k 1
+./fds_example -F /sys/fs/bpf/m2 -G -m -k 1
+./fds_example -F /sys/fs/bpf/m2 -G -m
+./fds_example -F /sys/fs/bpf/p -G -p
+./fds_example -F /sys/fs/bpf/p2 -G -p
+
+./do_hbm_test.sh -l -d=1 -D --stats
+./do_hbm_test.sh -l -d=1 -D --stats dctcp
+./do_hbm_test.sh -l -d=1 -D --stats -f=2
+./do_hbm_test.sh -l -d=1 -D --stats -f=4 -P
+./do_hbm_test.sh -l -d=1 -D --stats -f=4 -N
+
+./sampleip
+
+./sockex1
+./sockex2
+./sockex3
+./sock_example
+./spintest
+./syscall_tp
+./task_fd_query
+./tc_l2_redirect.sh
+./test_cgrp2_sock2.sh
+./test_cgrp2_sock.sh
+./test_cgrp2_tc.sh
+./test_cls_bpf.sh
+./test_current_task_under_cgroup
+./test_map_in_map
+./test_overhead
+timeout 10 ./tracex1
+./tracex2
+timeout 10 ./tracex3
+timeout 10 ./tracex4
+timeout 10 ./tracex5
+./tracex6
+./tracex7
+
+ip link add veth0t type veth peer name veth1t
+ip link set veth0t up
+ip link set veth1t up
+timeout 10 ./xdp_redirect_cpu --dev veth0t --progname xdp_cpu_map0 \
+--cpu 0 --cpu 1 --cpu 2
+timeout 10 ./xdp_redirect_cpu --dev veth0t --progname xdp_cpu_map1_touch_data \
+--cpu 0 --cpu 2 --cpu 3
+timeout 10 ./xdp_redirect_map `cat /sys/class/net/veth0t/ifindex` \
+`cat /sys/class/net/veth1t/ifindex`
+ip link delete veth0t
+
+./test_ipip.sh
+./trace_output
+
+cd ../../tools/testing/selftest/bpf/