diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index 662825f55f99..3969baa70b5f 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -41,7 +41,7 @@ srctree := $(patsubst %/,%,$(dir $(srctree)))
 endif
 
 CFLAGS += -g $(OPT_FLAGS) -rdynamic					\
-	  -Wall -Werror -fno-omit-frame-pointer				\
+	  -fno-omit-frame-pointer				\
 	  $(GENFLAGS) $(SAN_CFLAGS) $(LIBELF_CFLAGS)			\
 	  -I$(CURDIR) -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR)		\
 	  -I$(TOOLSINCDIR) -I$(APIDIR) -I$(OUTPUT)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 3df97b170d89..101835598a15 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -603,8 +603,12 @@ static struct nstoken *userspace_pm_init(enum mptcp_pm_type pm_type)
 
 static void userspace_pm_cleanup(void)
 {
+	SYS(fail, "ip netns exec %s cat %s", NS_TEST, PM_EVENTS);
+
 	SYS_NOFAIL("ip netns exec %s killall mptcp_pm_nl_ctl > /dev/null 2>&1", NS_TEST);
 	SYS_NOFAIL("ip netns exec %s rm -rf %s", NS_TEST, PM_EVENTS);
+fail:
+	;
 }
 
 static char *get_events_str(char *type)
@@ -1230,12 +1234,14 @@ static void test_stale(void)
 
 void test_mptcp(void)
 {
+#if 1
 	if (test__start_subtest("base"))
 		test_base();
 	if (test__start_subtest("mptcpify"))
 		test_mptcpify();
 	if (test__start_subtest("subflow"))
 		test_subflow();
+#endif
 	if (test__start_subtest("iters_subflow"))
 		test_iters_subflow();
 	if (test__start_subtest("iters_entry"))
@@ -1246,6 +1252,7 @@ void test_mptcp(void)
 		test_userspace_pm();
 	if (test__start_subtest("userspace_bpf"))
 		test_userspace_bpf();
+#if 1
 	if (test__start_subtest("default"))
 		test_default();
 	if (test__start_subtest("first"))
@@ -1260,4 +1267,5 @@ void test_mptcp(void)
 		test_burst();
 	if (test__start_subtest("stale"))
 		test_stale();
+#endif
 }