9 files changed, 14 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 0cddb30..d46ffb4 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ include 3rdParty/Expat/Makefile.inc
 include 3rdParty/SQLite/Makefile.inc
 include Swiften/Makefile.inc
 include Swift/Makefile.inc
-include Swiften/QA/Makefile.inc
+include QA/Makefile.inc
 
 ################################################################################
 # Main targets
diff --git a/QA/Makefile.inc b/QA/Makefile.inc
new file mode 100644
index 0000000..e86005d
--- /dev/null
+++ b/QA/Makefile.inc
@@ -0,0 +1,9 @@
+ifdef USE_VALGRIND
+# Not enabled: --show-reachable=yes
+TEST_RUNNER=valgrind --suppressions=QA/valgrind.supp -q --leak-check=full --track-origins=yes
+endif
+
+include QA/UnitTest/Makefile.inc
+
+.PHONY: test
+test: $(TEST_TARGETS)
diff --git a/Swiften/QA/UnitTest/Makefile.inc b/QA/UnitTest/Makefile.inc
index 5bdbec9..820fb64 100644
--- a/Swiften/QA/UnitTest/Makefile.inc
+++ b/QA/UnitTest/Makefile.inc
@@ -1,6 +1,6 @@
-UNITTEST_TARGET = Swiften/QA/UnitTest/checker
+UNITTEST_TARGET = QA/UnitTest/checker
 UNITTEST_SOURCES += \
-	Swiften/QA/UnitTest/checker.cpp
+	QA/UnitTest/checker.cpp
 UNITTEST_OBJECTS = \
 	$(UNITTEST_SOURCES:.cpp=.o)
 
diff --git a/Swiften/QA/UnitTest/checker.cpp b/QA/UnitTest/checker.cpp
index ea4f0d9..ea4f0d9 100644
--- a/Swiften/QA/UnitTest/checker.cpp
+++ b/QA/UnitTest/checker.cpp
diff --git a/Swiften/QA/UnitTest/template/FooTest.cpp b/QA/UnitTest/template/FooTest.cpp
index b6b9abf..b6b9abf 100644
--- a/Swiften/QA/UnitTest/template/FooTest.cpp
+++ b/QA/UnitTest/template/FooTest.cpp
diff --git a/Swiften/QA/valgrind.supp b/QA/valgrind.supp
index 5e2ee00..5e2ee00 100644
--- a/Swiften/QA/valgrind.supp
+++ b/QA/valgrind.supp
diff --git a/Swiften/Makefile.inc b/Swiften/Makefile.inc
index bb93bf8..12323db 100644
--- a/Swiften/Makefile.inc
+++ b/Swiften/Makefile.inc
@@ -42,4 +42,5 @@ lib: $(SWIFTEN_TARGET)
 $(SWIFTEN_TARGET): $(SWIFTEN_OBJECTS)
 	$(QUIET_AR)$(AR) $(ARFLAGS) $@ $(SWIFTEN_OBJECTS)
 
+include Swiften/QA/Makefile.inc
 include Swiften/Examples/Makefile.inc
diff --git a/Swiften/QA/Makefile.inc b/Swiften/QA/Makefile.inc
index dc3a0bf..831b443 100644
--- a/Swiften/QA/Makefile.inc
+++ b/Swiften/QA/Makefile.inc
@@ -1,11 +1,2 @@
-ifdef USE_VALGRIND
-# Not enabled: --show-reachable=yes
-TEST_RUNNER=valgrind --suppressions=Swiften/QA/valgrind.supp -q --leak-check=full --track-origins=yes
-endif
-
-include Swiften/QA/UnitTest/Makefile.inc
 include Swiften/QA/NetworkTest/Makefile.inc
 include Swiften/QA/ClientTest/Makefile.inc
-
-.PHONY: test
-test: $(TEST_TARGETS)
diff --git a/Swiften/QA/NetworkTest/Makefile.inc b/Swiften/QA/NetworkTest/Makefile.inc
index 3638f2f..055937b 100644
--- a/Swiften/QA/NetworkTest/Makefile.inc
+++ b/Swiften/QA/NetworkTest/Makefile.inc
@@ -2,7 +2,7 @@ NETWORKTEST_TARGET += Swiften/QA/NetworkTest/checker
 NETWORKTEST_SOURCES += \
 	Swiften/QA/NetworkTest/DomainNameResolverTest.cpp \
 	Swiften/QA/NetworkTest/BoostConnectionTest.cpp \
-	Swiften/QA/UnitTest/checker.cpp
+	QA/UnitTest/checker.cpp
 NETWORKTEST_OBJECTS = \
 	$(NETWORKTEST_SOURCES:.cpp=.o)