diff --git a/Makefile.am b/Makefile.am
index 660daa2d3c04098293dea09ad6ff55b7b86b97bb..89d04c35b8e0e5450039c970f307abb9a32ec7a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 # standard automake rules
-
-SUBDIRS = man lib scripts daemons doc testing tools
+SUBDIRS = man lib scripts daemons doc testing tools qa
 
 # custom rules
 depgraph: depgraph.png
diff --git a/configure.ac b/configure.ac
index 0ae0010b3a1e995ce801b9e7061110ff74012ddb..ad56fda46c093a32f938a25fce7113442ff0c787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ AC_CONFIG_FILES([
   doc/examples/Makefile
   lib/Makefile
   man/Makefile
+  qa/Makefile
   scripts/Makefile
   testing/Makefile
   tools/Makefile
diff --git a/qa/Makefile.am b/qa/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..495e87ca8b8bcd33ecf5659a516cfaae99c86848
--- /dev/null
+++ b/qa/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = ganeti-qa.py qa-sample.yaml
+CLEANFILES = *.py[co]
diff --git a/testing/ganeti.qa.py b/qa/ganeti-qa.py
similarity index 100%
rename from testing/ganeti.qa.py
rename to qa/ganeti-qa.py
diff --git a/testing/qa-sample.yaml b/qa/qa-sample.yaml
similarity index 100%
rename from testing/qa-sample.yaml
rename to qa/qa-sample.yaml
diff --git a/testing/Makefile.am b/testing/Makefile.am
index 9fb5f7e449b994a31c89377db85fbcad6da01671..e0d9de48383cdbba80cac1c90724b3f6e1d3200d 100644
--- a/testing/Makefile.am
+++ b/testing/Makefile.am
@@ -6,5 +6,5 @@ ganeti:
 	rm -f ganeti
 	ln -s $(top_srcdir)/lib ganeti
 
-EXTRA_DIST = $(TESTS) mocks.py ganeti.qa.py qa-sample.yaml
+EXTRA_DIST = $(TESTS) mocks.py
 MAINTAINERCLEANFILES = ganeti