diff --git a/Makefile b/Makefile
index 32be494d3..59c921d71 100644
--- a/Makefile
+++ b/Makefile
@@ -153,8 +153,16 @@ $(DEPS_GEN): $(HEAD-BLOB-GEN) $(RHEAD-BLOB-GEN)
 %.d: %.c
 	$(Q) $(CC) -M -MT $(patsubst %.d,%.o,$@) $(CFLAGS) $< -o $@
 
-test:
-	$(Q) $(MAKE) -C test all
+test-legacy:
+	$(Q) $(MAKE) -C test/legacy all
+.PHONY: test-legacy
+
+zdtm:
+	$(Q) $(MAKE) -C test/zdtm all
+.PHONY: zdtm
+
+test: zdtm
+	$(Q) $(sh) test/zdtm.sh
 .PHONY: test
 
 rebuild:
@@ -176,7 +184,8 @@ clean:
 	$(Q) $(RM) -f ./$(PROGRAM)
 	$(Q) $(RM) -f ./$(HEAD-BLOB-GEN)
 	$(Q) $(RM) -f ./$(RHEAD-BLOB-GEN)
-	$(Q) $(MAKE) -C test clean
+	$(Q) $(MAKE) -C test/legacy clean
+	$(Q) $(MAKE) -C test/zdtm clean
 .PHONY: clean
 
 tags:
diff --git a/test/Makefile b/test/legacy/Makefile
similarity index 100%
rename from test/Makefile
rename to test/legacy/Makefile
diff --git a/test/test-counter.c b/test/legacy/test-counter.c
similarity index 100%
rename from test/test-counter.c
rename to test/legacy/test-counter.c
diff --git a/test/test-pipe-async.c b/test/legacy/test-pipe-async.c
similarity index 100%
rename from test/test-pipe-async.c
rename to test/legacy/test-pipe-async.c
diff --git a/test/test-pthreads.c b/test/legacy/test-pthreads.c
similarity index 100%
rename from test/test-pthreads.c
rename to test/legacy/test-pthreads.c
diff --git a/test/test-rnd-from-file.c b/test/legacy/test-rnd-from-file.c
similarity index 100%
rename from test/test-rnd-from-file.c
rename to test/legacy/test-rnd-from-file.c
diff --git a/test/test-shmem-async.c b/test/legacy/test-shmem-async.c
similarity index 100%
rename from test/test-shmem-async.c
rename to test/legacy/test-shmem-async.c
diff --git a/test/test-shmem-three-async.c b/test/legacy/test-shmem-three-async.c
similarity index 100%
rename from test/test-shmem-three-async.c
rename to test/legacy/test-shmem-three-async.c
diff --git a/test/test-sigaction.c b/test/legacy/test-sigaction.c
similarity index 100%
rename from test/test-sigaction.c
rename to test/legacy/test-sigaction.c
diff --git a/test/test-unixsocket.c b/test/legacy/test-unixsocket.c
similarity index 100%
rename from test/test-unixsocket.c
rename to test/legacy/test-unixsocket.c
diff --git a/test/test-vdso.c b/test/legacy/test-vdso.c
similarity index 100%
rename from test/test-vdso.c
rename to test/legacy/test-vdso.c