diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 45a0df784..051572838 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -232,6 +232,13 @@ TST_NOFILE	:=				\
 		zombie_leader			\
 #		jobctl00			\
 
+pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
+ifeq ($(call pkg-config-check,libbpf),y)
+TST_NOFILE	+=				\
+		bpf_hash			\
+		bpf_array			
+endif
+
 ifneq ($(ARCH),arm)
 ifneq ($(COMPAT_TEST),y)
         TST_NOFILE += maps03
@@ -574,6 +581,9 @@ s390x_gs_threads:	LDFLAGS += -pthread
 
 thread_different_uid_gid:	LDLIBS += -pthread -lcap
 
+bpf_hash:		LDLIBS += -lbpf
+bpf_array:		LDLIBS += -lbpf
+
 $(LIB):	force
 	$(Q) $(MAKE) -C $(LIBDIR)
 
diff --git a/test/zdtm/static/bpf_array.c b/test/zdtm/static/bpf_array.c
new file mode 100644
index 000000000..4019d45d2
--- /dev/null
+++ b/test/zdtm/static/bpf_array.c
@@ -0,0 +1,155 @@
+#include <linux/bpf.h>
+#include <bpf/bpf.h>
+#include <sys/mman.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check that data and meta-data for BPF_MAP_TYPE_ARRAY"
+							"is correctly restored";
+const char *test_author	= "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
+
+static int map_batch_update(int map_fd, uint32_t max_entries, int *keys, int *values)
+{
+	int i, ret;
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
+		.elem_flags = 0,
+		.flags = 0,
+	);
+
+	for (i = 0; i < max_entries; i++) {
+		keys[i] = i;
+		values[i] = i + 1;
+	}
+
+	ret = bpf_map_update_batch(map_fd, keys, values, &max_entries, &opts);
+	if (ret && errno != ENOENT) {
+		pr_perror("Can't load key-value pairs to BPF map fd");
+		return -1;
+	}
+	return 0;
+}
+
+static int map_batch_verify(int *visited, uint32_t max_entries, int *keys, int *values)
+{
+	int i;
+
+	memset(visited, 0, max_entries * sizeof(*visited));
+	for (i = 0; i < max_entries; i++) {
+		if (keys[i] + 1 != values[i]) {
+			pr_err("Key/value checking error: i=%d, key=%d, value=%d\n", i, keys[i], values[i]);
+			return -1;
+		}
+		visited[i] = 1;
+	}
+	for (i = 0; i < max_entries; i++) {
+		if (visited[i] != 1) {
+			pr_err("Visited checking error: keys array at index %d missing\n", i);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	uint32_t batch, count;
+	int map_fd;
+	int *keys = NULL, *values = NULL, *visited = NULL;
+	const uint32_t max_entries = 10;
+	int ret;
+	struct bpf_map_info map_info = {};
+	uint32_t info_len = sizeof(map_info);
+	struct bpf_create_map_attr xattr = {
+		.map_type = BPF_MAP_TYPE_ARRAY,
+		.key_size = sizeof(int),
+		.value_size = sizeof(int),
+		.max_entries = max_entries,
+		.map_flags = BPF_F_NUMA_NODE,
+	};
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
+		.elem_flags = 0,
+		.flags = 0,
+	);
+
+	keys = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);	
+	values = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	visited = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	
+	if ((keys == MAP_FAILED) || (values == MAP_FAILED) || (visited == MAP_FAILED)) {
+		pr_perror("Can't mmap()");
+		goto err;
+	}
+
+	test_init(argc, argv);
+
+	map_fd = bpf_create_map_xattr(&xattr);
+	if (map_fd == -1) {
+		pr_perror("Can't create BPF map");
+		goto err;
+	}
+
+	if (map_batch_update(map_fd, max_entries, keys, values))
+		goto err;
+
+	test_daemon();
+
+	test_waitsig();
+
+	ret = bpf_obj_get_info_by_fd(map_fd, &map_info, &info_len);
+	if (ret) {
+		pr_perror("Could not get map info");
+		goto err;
+	}
+	
+	if (map_info.type != BPF_MAP_TYPE_ARRAY) {
+		pr_err("Map type should be BPF_MAP_TYPE_ARRAY\n");
+		goto err;
+	}
+	if (map_info.key_size != sizeof(*keys)) {
+		pr_err("Key size should be %zu\n", sizeof(*keys));
+		goto err;
+	}
+	if (map_info.value_size != sizeof(*values)) {
+		pr_err("Value size should be %zu\n", sizeof(*values));
+		goto err;
+	}
+	if (map_info.max_entries != max_entries) {
+		pr_err("Max entries should be %d\n", max_entries);
+		goto err;
+	}
+	if (!(map_info.map_flags & BPF_F_NUMA_NODE)) {
+		pr_err("Map flag BPF_F_NUMA_NODE should be set\n");
+		goto err;
+	}
+
+	memset(keys, 0, max_entries * sizeof(*keys));
+	memset(values, 0, max_entries * sizeof(*values));
+
+	ret = bpf_map_lookup_batch(map_fd, NULL, &batch, keys, values, &count, &opts);
+	if (ret && errno != ENOENT) {
+		pr_perror("Can't perform a batch lookup on BPF map");
+		goto err;
+	}
+
+	if (map_batch_verify(visited, max_entries, keys, values))
+		goto err;
+
+	munmap(keys, max_entries * sizeof(int));
+	munmap(values, max_entries * sizeof(int));
+	munmap(visited, max_entries * sizeof(int));
+
+	pass();
+	return 0;
+
+err:
+	munmap(keys, max_entries * sizeof(int));
+	munmap(values, max_entries * sizeof(int));
+	munmap(visited, max_entries * sizeof(int));
+	
+	fail();
+	return 1;
+}
\ No newline at end of file
diff --git a/test/zdtm/static/bpf_hash.c b/test/zdtm/static/bpf_hash.c
new file mode 100644
index 000000000..f1cf667b5
--- /dev/null
+++ b/test/zdtm/static/bpf_hash.c
@@ -0,0 +1,158 @@
+#include <linux/bpf.h>
+#include <bpf/bpf.h>
+#include <sys/mman.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check that data and meta-data for BPF_MAP_TYPE_HASH"
+							"is correctly restored";
+const char *test_author	= "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
+
+static int map_batch_update(int map_fd, uint32_t max_entries, int *keys, int *values)
+{
+	int ret;
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
+		.elem_flags = 0,
+		.flags = 0,
+	);
+
+	for (int i = 0; i < max_entries; i++) {
+		keys[i] = i + 1;
+		values[i] = i + 2;
+	}
+
+	ret = bpf_map_update_batch(map_fd, keys, values, &max_entries, &opts);
+	if (ret && errno != ENOENT) {
+		pr_perror("Can't load key-value pairs to BPF map");
+		return -1;
+	}
+	return 0;
+}
+
+static int map_batch_verify(int *visited, uint32_t max_entries, int *keys, int *values)
+{
+	memset(visited, 0, max_entries * sizeof(*visited));
+	for (int i = 0; i < max_entries; i++) {
+		
+		if (keys[i] + 1 != values[i]) {
+			pr_err("Key/value checking error: i=%d, key=%d, value=%d\n", i, keys[i], values[i]);
+			return -1;
+		}
+		visited[i] = 1;
+	}
+	for (int i = 0; i < max_entries; i++) {
+		if (visited[i] != 1) {
+			pr_err("Visited checking error: keys array at index %d missing\n", i);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	uint32_t batch, count;
+	int map_fd;
+	int *keys = NULL, *values = NULL, *visited = NULL;
+	const uint32_t max_entries = 10;
+	int ret;
+	struct bpf_map_info map_info = {};
+	uint32_t info_len = sizeof(map_info);
+	struct bpf_create_map_attr xattr = {
+		.map_type = BPF_MAP_TYPE_HASH,
+		.key_size = sizeof(int),
+		.value_size = sizeof(int),
+		.max_entries = max_entries,
+		.map_flags = BPF_F_NO_PREALLOC | BPF_F_NUMA_NODE,
+	};
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
+		.elem_flags = 0,
+		.flags = 0,
+	);
+
+	keys = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);	
+	values = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	visited = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	
+	if ((keys == MAP_FAILED) || (values == MAP_FAILED) || (visited == MAP_FAILED)) {
+		pr_perror("Can't mmap()");
+		goto err;
+	}
+
+	test_init(argc, argv);
+
+	map_fd = bpf_create_map_xattr(&xattr);
+	if (!map_fd) {
+		pr_perror("Can't create BPF map");
+		goto err;
+	}
+
+	if (map_batch_update(map_fd, max_entries, keys, values))
+		goto err;
+
+	test_daemon();
+
+	test_waitsig();
+
+	ret = bpf_obj_get_info_by_fd(map_fd, &map_info, &info_len);
+	if (ret) {
+		pr_perror("Could not get map info");
+		goto err;
+	}
+	
+	if (map_info.type != BPF_MAP_TYPE_HASH) {
+		pr_err("Map type should be BPF_MAP_TYPE_HASH\n");
+		goto err;
+	}
+	if (map_info.key_size != sizeof(*keys)) {
+		pr_err("Key size should be %zu\n", sizeof(*keys));
+		goto err;
+	}
+	if (map_info.value_size != sizeof(*values)) {
+		pr_err("Value size should be %zu\n", sizeof(*values));
+		goto err;
+	}
+	if (map_info.max_entries != max_entries) {
+		pr_err("Max entries should be %d\n", max_entries);
+		goto err;
+	}
+	if (!(map_info.map_flags & BPF_F_NO_PREALLOC)) {
+		pr_err("Map flag BPF_F_NO_PREALLOC should be set\n");
+		goto err;
+	}
+	if (!(map_info.map_flags & BPF_F_NUMA_NODE)) {
+		pr_err("Map flag BPF_F_NUMA_NODE should be set\n");
+		goto err;
+	}
+
+	memset(keys, 0, max_entries * sizeof(*keys));
+	memset(values, 0, max_entries * sizeof(*values));
+
+	ret = bpf_map_lookup_batch(map_fd, NULL, &batch, keys, values, &count, &opts);
+	if (ret && errno != ENOENT) {
+		pr_perror("Can't perform a batch lookup on BPF map");
+		goto err;
+	}
+
+	if (map_batch_verify(visited, max_entries, keys, values))
+		goto err;
+
+	munmap(keys, max_entries * sizeof(int));
+	munmap(values, max_entries * sizeof(int));
+	munmap(visited, max_entries * sizeof(int));
+
+	pass();
+	return 0;
+
+err:
+	munmap(keys, max_entries * sizeof(int));
+	munmap(values, max_entries * sizeof(int));
+	munmap(visited, max_entries * sizeof(int));
+	
+	fail();
+	return 1;
+}
\ No newline at end of file