-# Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests tests/qemu regressions extratests test-tool
+# Tests - order is important.
+SUBDIRS += tests/qemu
+SUBDIRS += tests/guests
+SUBDIRS += tests/c-api
+SUBDIRS += tests/protocol
+SUBDIRS += tests/lvm
+SUBDIRS += tests/luks
+SUBDIRS += tests/md
+SUBDIRS += tests/regressions
+
+# Extra tests don't run by default. You have to do 'make extra-tests'.
+SUBDIRS += tests/extra
+
+# libguestfs-test-tool
+SUBDIRS += test-tool