diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..0a0b8b5a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "bird-tools"]
+	path = bird-tools
+	url = https://gitlab.nic.cz/labs/bird-tools
diff --git a/Makefile.in b/Makefile.in
index e0ff4a1d..6e5cf86d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,6 +84,7 @@ cf-local = $(conf-y-targets): $(s)config.Y
 
 src-o-files = $(patsubst %.c,$(o)%.o,$(src))
 tests-target-files = $(patsubst %.c,$(o)%,$(tests_src))
+tests_targets_ok := 
 
 all-daemon = $(daemon): $(obj)
 all-client = $(client): $(obj)
@@ -167,7 +168,7 @@ $(objdir)/sysdep/paths.h: Makefile
 
 # Unit tests rules
 
-tests_targets_ok = $(addsuffix .ok,$(tests_targets))
+tests_targets_ok += $(addsuffix .ok,$(tests_targets))
 
 $(tests_targets): %: %.o $(tests_objs) | prepare
 	$(E)echo LD $(LDFLAGS) -o $@ $< "..." $(LIBS)
@@ -179,6 +180,9 @@ $(tests_targets): LIBS += $(DAEMON_LIBS)
 $(tests_targets_ok): %.ok: %
 	$(Q)$* 2>/dev/null && touch $*.ok
 
+# Include the netlab testsuite target listing
+-include bird-tools/netlab/runtests.mk
+
 test: testsclean check
 check: tests tests_run
 tests: $(tests_targets)
diff --git a/bird-tools b/bird-tools
new file mode 160000
index 00000000..94362b27
--- /dev/null
+++ b/bird-tools
@@ -0,0 +1 @@
+Subproject commit 94362b27e7fad080f6262aa26c532ee42343af69