diff --git a/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0 b/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
index 0c8ee5b..38fa5fe 100644
--- a/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
+++ b/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
@@ -39,6 +39,7 @@ reference_tracking
 select_reuseport	# UDP support is missing
 sk_assign		# bpf_sk_assign helper missing
 skb_helpers		# helpers added in 5.8+
+sockmap_basic		# uses new socket fields, 5.8+
 sockmap_listen		# no listen socket supportin SOCKMAP
 skb_ctx			# ctx_{size, }_{in, out} in BPF_PROG_TEST_RUN is missing
 test_global_funcs	# kernel doesn't support BTF linkage=global on FUNCs
@@ -49,6 +50,7 @@ vmlinux			# hrtimer_nanosleep() signature changed incompatibly
 xdp_adjust_tail		# new XDP functionality added in 5.8
 xdp_attach		# IFLA_XDP_EXPECTED_FD support is missing
 xdp_bpf2bpf		# freplace is missing
+xdp_devmap_attach	# new feature in 5.8
 
 
 # TEMPORARILY DISABLED
diff --git a/travis-ci/vmtest/prepare_selftests-5.5.0.sh b/travis-ci/vmtest/prepare_selftests-5.5.0.sh
deleted file mode 100755
index 2c874c1..0000000
--- a/travis-ci/vmtest/prepare_selftests-5.5.0.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -euxo pipefail
-
-# these tests expect vmlinux.h to have latest defiition of bpf_devmap_val xdp_md->egress_ifindex
-rm progs/test_xdp_with_devmap_helpers.c
-rm progs/test_xdp_devmap_helpers.c
-rm prog_tests/xdp_devmap_attach.c
-
-# no BPF_F_NO_PREALLOC in BTF and no sk_msg_md->sk field
-rm progs/test_skmsg_load_helpers.c
-rm prog_tests/sockmap_basic.c