diff --git a/jobs/kernel-selftests-bpf.yaml b/jobs/kernel-selftests-bpf.yaml
index be08feaa1..3a0bb6ceb 100644
--- a/jobs/kernel-selftests-bpf.yaml
+++ b/jobs/kernel-selftests-bpf.yaml
@@ -10,3 +10,4 @@ need_cpu: 2
 kernel-selftests-bpf:
   group:
     - bpf
+    - hid
diff --git a/jobs/kernel-selftests.yaml b/jobs/kernel-selftests.yaml
index 98762adc1..90dd3daba 100644
--- a/jobs/kernel-selftests.yaml
+++ b/jobs/kernel-selftests.yaml
@@ -39,7 +39,6 @@ kernel-selftests:
     - fpu
     - futex
     - gpio
-    - hid
     - ia64
     - intel_pstate
     - iommu
diff --git a/lib/tests/kernel-selftests.sh b/lib/tests/kernel-selftests.sh
index 67b4793bf..d031d2993 100644
--- a/lib/tests/kernel-selftests.sh
+++ b/lib/tests/kernel-selftests.sh
@@ -204,6 +204,13 @@ recover_sysctl_output()
 	sed -i "/\t\${NSA_CMD} sysctl -q -w net.ipv4.ping_group_range='0 2147483647'/i \\\techo \"SYSCTL: net.ipv4.ping_group_range=0 2147483647\"\n\techo" net/fcnal-test.sh
 }
 
+fixup_hid()
+{
+	# make: Entering directory '/usr/src/perf_selftests-x86_64-rhel-9.4-kselftests-adc218676eef25575469234709c2d87185ca223a/tools/testing/selftests/hid'
+	# Makefile:93: *** Cannot find a vmlinux for VMLINUX_BTF at any of "  ../../../../vmlinux /sys/kernel/btf/vmlinux /boot/vmlinux-6.12.0".  Stop.
+	prepare_for_bpf
+}
+
 fixup_net()
 {
 	prepare_for_bpf
diff --git a/programs/kernel-selftests-bpf/include b/programs/kernel-selftests-bpf/include
index 449d24d9c..700ef600d 100644
--- a/programs/kernel-selftests-bpf/include
+++ b/programs/kernel-selftests-bpf/include
@@ -396,7 +396,7 @@ need_kconfig:
 - IP6_NF_FILTER: m
 - IP_ADVANCED_ROUTER: y
 - IP_MULTIPLE_TABLES: y
-- IP_NF_FILTER: m
+- IP_NF_FILTER
 - IP_NF_MANGLE: m
 - IP_NF_TARGET_REJECT: m
 - IPV6_MULTIPLE_TABLES: y
@@ -442,7 +442,7 @@ need_kconfig:
 - IP6_NF_IPTABLES: m
 - IP6_NF_MATCH_RPFILTER: m
 - IP6_NF_RAW: m
-- IP_NF_FILTER: m
+- IP_NF_FILTER
 - IP_NF_IPTABLES: m
 - IP_NF_MATCH_RPFILTER: m
 - IP_NF_RAW: m
@@ -535,4 +535,282 @@ need_kconfig:
 - FUNCTION_GRAPH_RETVAL: y
 - FUNCTION_GRAPH_TRACER: y
 - DEBUG_INFO_BTF: y, x86_64
+% elsif ___.group == "hid"
+- 9P_FS_POSIX_ACL: y
+- 9P_FS_SECURITY: y
+- 9P_FS: y
+- AUDIT: y
+- BINFMT_MISC
+- BLK_CGROUP_IOLATENCY: y
+- BLK_CGROUP: y
+- BLK_DEV_BSGLIB: y
+- BLK_DEV_IO_TRACE: y
+- BLK_DEV_RAM_SIZE: 16384
+- BLK_DEV_RAM
+- BLK_DEV_THROTTLING: y
+- BONDING: m
+- BOOTPARAM_HARDLOCKUP_PANIC: y
+- BOOTTIME_TRACING: y
+- BPF_EVENTS: y
+- BPF_JIT_ALWAYS_ON: y
+- BPF_JIT: y
+- BPF_KPROBE_OVERRIDE: y
+- BPF_LSM: y
+- BPF_PRELOAD_UMD: y
+- BPF_PRELOAD: y
+- BPF_STREAM_PARSER: y
+- BPF_SYSCALL: y
+- BPF: y
+- BSD_DISKLABEL: y
+- BSD_PROCESS_ACCT: y
+- CFS_BANDWIDTH: y
+- CGROUP_BPF: y
+- CGROUP_CPUACCT: y
+- CGROUP_DEBUG: y
+- CGROUP_DEVICE: y
+- CGROUP_FREEZER: y
+- CGROUP_HUGETLB: y
+- CGROUP_NET_CLASSID: y
+- CGROUP_NET_PRIO: y
+- CGROUP_PERF: y
+- CGROUP_PIDS: y
+- CGROUP_RDMA: y
+- CGROUP_SCHED: y
+- CGROUPS: y
+- CGROUP_WRITEBACK: y
+- CMA_AREAS: 7
+- CMA: y
+- COMPAT_32BIT_TIME: y
+- CPU_FREQ_DEFAULT_GOV_PERFORMANCE: y
+- X86_INTEL_PSTATE: n
+- CPU_FREQ_GOV_CONSERVATIVE: y
+- CPU_FREQ_GOV_ONDEMAND: y
+- CPU_FREQ_GOV_USERSPACE: y
+- CPU_FREQ_STAT: y
+- CPU_IDLE_GOV_LADDER: y
+- CPUSETS: y
+- CRC_T10DIF: y
+- CRYPTO_BLAKE2B
+- CRYPTO_DEV_VIRTIO
+- CRYPTO_SEQIV: y
+- CRYPTO_XXHASH
+- DCB: y
+- DEBUG_ATOMIC_SLEEP: y
+- DEBUG_INFO_BTF: y, x86_64
+- DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT: y
+- DEBUG_MEMORY_INIT: y
+- DEFAULT_FQ_CODEL: y
+- DEFAULT_RENO: y
+- DEFAULT_SECURITY_DAC: y
+- DEVTMPFS_MOUNT: y
+- DEVTMPFS: y
+- DMA_CMA: y
+- DNS_RESOLVER
+- DYNAMIC_FTRACE_WITH_DIRECT_CALLS: y
+- EFI_STUB: y
+- EFI: y
+- EXPERT: y
+- EXT4_FS_POSIX_ACL: y
+- EXT4_FS_SECURITY: y
+- EXT4_FS: y
+- FAIL_FUNCTION: y
+- FAULT_INJECTION_DEBUG_FS: y
+- FAULT_INJECTION: y
+- FB_MODE_HELPERS: y
+- FB_TILEBLITTING: y
+- FB_VESA: y
+- FB: y
+- FONT_8x16: y
+- FONT_MINI_4x6: y
+- FONTS: y
+- FPROBE: y
+- FRAMEBUFFER_CONSOLE_DETECT_PRIMARY: y
+- FRAMEBUFFER_CONSOLE_ROTATION: y
+- FRAMEBUFFER_CONSOLE: y
+- FTRACE_SYSCALLS: y
+- FUNCTION_TRACER: y
+- FUSE_FS: y
+- FW_LOADER_USER_HELPER: y
+- GART_IOMMU: y
+- GENERIC_PHY: y
+- HARDLOCKUP_DETECTOR: y
+- HID_APPLE: y
+- HID_BPF: y
+- HID_ITE: y
+- HID_MULTITOUCH: y
+- HID_PLAYSTATION: y
+- HIDRAW: y
+- HID_SONY: y
+- HID_WACOM: y
+- HID: y
+- HIGH_RES_TIMERS: y
+- HPET: y
+- HUGETLBFS: y
+- HUGETLB_PAGE: y
+- HWPOISON_INJECT
+- HZ_1000: y
+- INET: y
+- INPUT_EVDEV: y
+- INTEL_POWERCLAMP
+- IP6_NF_FILTER: m
+- IP6_NF_IPTABLES: m
+- IP6_NF_NAT: m
+- IP6_NF_TARGET_MASQUERADE: y
+- IP_ADVANCED_ROUTER: y
+- IP_MROUTE: y
+- IP_MULTICAST: y
+- IP_MULTIPLE_TABLES: y
+- IP_NF_FILTER
+- IP_NF_IPTABLES: m
+- IP_NF_NAT: m
+- IP_NF_TARGET_MASQUERADE: y
+- IP_PIMSM_V1: y
+- IP_PIMSM_V2: y
+- IP_ROUTE_MULTIPATH: y
+- IP_ROUTE_VERBOSE: y
+- IPV6_MIP6
+- IPV6_ROUTE_INFO: y
+- IPV6_ROUTER_PREF: y
+- IPV6_SEG6_LWTUNNEL: y
+- IPV6_SUBTREES: y
+- IRQ_POLL: y
+- JUMP_LABEL: y
+- KARMA_PARTITION: y
+- KASAN: y
+- KEXEC: y
+- KPROBES: y
+- KSM: y
+- LEDS_CLASS_MULTICOLOR: y
+- LEGACY_VSYSCALL_NONE: y
+- LOG_BUF_SHIFT: 21
+- LOG_CPU_MAX_BUF_SHIFT: 0
+- LOGO: y
+- MAC_PARTITION: y
+- MAGIC_SYSRQ: y
+- MCORE2: y
+- MEMCG: y
+- MEMORY_FAILURE: y
+- MINIX_SUBPARTITION: y
+- MODULES: y
+- NAMESPACES: y
+- NET_9P_VIRTIO: y
+- NET_9P: y
+- NET_ACT_BPF: y
+- NET_CLS_CGROUP: y
+- NETDEVICES: y
+- NET_EMATCH: y
+- NETFILTER_NETLINK_LOG: m
+- NETFILTER_NETLINK_QUEUE: m
+- NETFILTER_XTABLES: m
+- NETFILTER_XT_MATCH_ADDRTYPE: y
+- NETFILTER_XT_MATCH_BPF: m
+- NETFILTER_XT_MATCH_COMMENT: y
+- NETFILTER_XT_MATCH_CONNTRACK: m
+- NETFILTER_XT_MATCH_MARK: y
+- NETFILTER_XT_MATCH_MULTIPORT: y
+- NETFILTER_XT_MATCH_STATISTIC: m
+- NETFILTER_XT_NAT: m
+- NETFILTER_XT_TARGET_MASQUERADE: y
+- NET_IPGRE_BROADCAST: y
+- NET_L3_MASTER_DEV: y
+- NETLABEL: y
+- NET_SCH_DEFAULT: y
+- NET_SCHED: y
+- NET_SCH_FQ_CODEL: m
+- NET_TC_SKB_EXT: y
+- NET_VRF
+- NET: y
+- NF_CONNTRACK: m
+- NF_NAT_MASQUERADE: y
+- NF_NAT: m
+- NLS_ASCII: y
+- NLS_CODEPAGE_437: y
+- NLS_DEFAULT: "utf8"
+- NO_HZ: y
+- NR_CPUS: 128
+- NUMA_BALANCING: y
+- NUMA: y
+- NVMEM: y
+- OSF_PARTITION: y
+- OVERLAY_FS_INDEX: y
+- OVERLAY_FS_METACOPY: y
+- OVERLAY_FS_XINO_AUTO: y
+- OVERLAY_FS
+- PACKET: y
+- PANIC_ON_OOPS: y
+- PARTITION_ADVANCED: y
+- PCIEPORTBUS: y
+- PCI_IOV: y
+- PCI_MSI: y
+- PCI: y
+- PHYSICAL_ALIGN: "0x1000000"
+- PLAYSTATION_FF: y
+- POSIX_MQUEUE: y
+- POWER_SUPPLY: y
+- PREEMPT: y
+- PRINTK_TIME: y
+- PROC_KCORE: y
+- PROFILING: y
+- PROVE_LOCKING: y
+- PTP_1588_CLOCK: y
+- RC_DEVICES: y
+- RC_LOOPBACK
+- RCU_CPU_STALL_TIMEOUT: 60
+- SCHED_STACK_END_CHECK: y
+- SCHEDSTATS: y
+- SECURITY_NETWORK: y
+- SECURITY_SELINUX: y
+- SERIAL_8250_CONSOLE: y
+- SERIAL_8250_DETECT_IRQ: y
+- SERIAL_8250_EXTENDED: y
+- SERIAL_8250_MANY_PORTS: y
+- SERIAL_8250_NR_UARTS: 32
+- SERIAL_8250_RSA: y
+- SERIAL_8250_SHARE_IRQ: y
+- SERIAL_8250: y
+- SERIAL_NONSTANDARD: y
+- SERIO_LIBPS2: y
+- SGI_PARTITION: y
+- SMP: y
+- SOCK_CGROUP_DATA: y
+- SOLARIS_X86_PARTITION: y
+- SONY_FF: y
+- SUN_PARTITION: y
+- SYNC_FILE: y
+- SYSVIPC: y
+- TASK_DELAY_ACCT: y
+- TASK_IO_ACCOUNTING: y
+- TASKSTATS: y
+- TASK_XACCT: y
+- TCP_CONG_ADVANCED: y
+- TCP_MD5SIG: y
+- TLS: m
+- TMPFS_POSIX_ACL: y
+- TMPFS: y
+- TRANSPARENT_HUGEPAGE_MADVISE: y
+- TRANSPARENT_HUGEPAGE: y
+- TUN
+- UHID: y
+- UNIXWARE_DISKLABEL: y
+- UNIX: y
+- USB_HID: y
+- USB: y
+- USER_NS: y
+- VALIDATE_FS_PARSER: y
+- VETH
+- VIRT_DRIVERS: y
+- VIRTIO_BALLOON
+- VIRTIO_BLK
+- VIRTIO_CONSOLE
+- VIRTIO_FS: y
+- VIRTIO_NET
+- VIRTIO_PCI: y
+- VLAN_8021Q
+- X86_ACPI_CPUFREQ
+- X86_CPUID: y
+- X86_MSR: y
+- X86_POWERNOW_K8: y
+- XFRM_SUB_POLICY: y
+- XFRM_USER
+- ZEROPLUS_FF: y
 % end