diff --git a/Makefile b/Makefile
index 99f2edadf..a1c9554c6 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,6 @@ DIRS=parser \
      changehat/libapparmor \
      changehat/mod_apparmor \
      changehat/pam_apparmor \
-     management/apparmor-dbus \
-     management/applets/apparmorapplet-gnome \
-     management/yastui \
-     common \
      tests
 
 REPO_URL?=lp:apparmor
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 000000000..1fddf9b8b
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,7 @@
+SUBDIRS=regression stress
+
+.PHONY: clean
+clean:
+	for dir in $(SUBDIRS) ; do \
+		make clean -C $${dir} ; \
+	done
diff --git a/tests/regression/Makefile b/tests/regression/Makefile
new file mode 100644
index 000000000..0551dc4f1
--- /dev/null
+++ b/tests/regression/Makefile
@@ -0,0 +1,7 @@
+SUBDIRS=apparmor
+
+.PHONY: clean
+clean:
+	for dir in $(SUBDIRS) ; do \
+		make clean -C $${dir} ; \
+	done
diff --git a/tests/stress/Makefile b/tests/stress/Makefile
new file mode 100644
index 000000000..f46fb127c
--- /dev/null
+++ b/tests/stress/Makefile
@@ -0,0 +1,7 @@
+SUBDIRS=subdomain
+
+.PHONY: clean
+clean:
+	for dir in $(SUBDIRS) ; do \
+		make clean -C $${dir} ; \
+	done