diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 4c7ca72fdf0..07d3bc6e218 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -269,6 +269,7 @@ TST_NOFILE	:=				\
 		sigtrap				\
 		sigtrap01			\
 		change_mnt_context		\
+		fd_offset			\
 #		jobctl00			\
 
 PKG_CONFIG ?= pkg-config
diff --git a/test/zdtm/static/fd_offset.c b/test/zdtm/static/fd_offset.c
new file mode 100644
index 00000000000..96255a4a1f4
--- /dev/null
+++ b/test/zdtm/static/fd_offset.c
@@ -0,0 +1,42 @@
+#include <fcntl.h>
+
+#include "zdtmtst.h"
+#include "lock.h"
+
+const char *test_doc = "Check that criu properly restores offsets on ELF files";
+const char *test_author = "Michal Clapinski <mclapinski@google.com>";
+
+void check_offset(int fd)
+{
+	int offset = lseek(fd, 0, SEEK_CUR);
+	if (offset < 0) {
+		fail("lseek");
+		exit(1);
+	}
+	if (offset != 0) {
+		fail("wrong offset; expected: 0, got: %d", offset);
+		exit(1);
+	}
+}
+
+int main(int argc, char **argv)
+{
+	int fd;
+
+	test_init(argc, argv);
+
+	fd = open("/proc/self/exe", O_RDONLY);
+	if (fd < 0) {
+		fail("open");
+		exit(1);
+	}
+	check_offset(fd);
+
+	test_daemon();
+	test_waitsig();
+
+	check_offset(fd);
+
+	pass();
+	return 0;
+}