diff --git a/net-im/swift/swift-9999.ebuild b/net-im/swift/swift-9999.ebuild
index 6d3fbbd..bc20bda 100644
--- a/net-im/swift/swift-9999.ebuild
+++ b/net-im/swift/swift-9999.ebuild
@@ -63,7 +63,7 @@ DEPEND="
 	test? ( net-dns/avahi )
 "
 
-# Tests don't run, as they fail with a "KeyError: 'CPPUNIT_FLAGS'".
+# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
 RESTRICT="test"
 
 DOCS=(
@@ -84,10 +84,36 @@ src_prepare() {
 	# Remove parts of Swift, which a user don't want to compile
 	if ! use client; then rm -fr Swift Slimber || die; fi
 	if ! use lua; then rm -fr Sluift || die; fi
-	if ! use zeroconf; then rm -fr Limber || die; fi
+	if ! use zeroconf; then
+		rm -fr Limber || die
+		if use client; then rm -fr Slimber || die; fi
+	fi
 
 	# Remove '3rdParty', as the system libs should be used
-	rm -fr 3rdParty || die
+	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
+	local my3rdparty=(
+		Boost
+		Breakpad
+		DocBook
+		Expat
+		LCov
+		Ldns
+		LibIDN
+		LibMiniUPnPc
+		LibNATPMP
+		Lua
+		OpenSSL
+		SCons
+		SQLite
+		Unbound
+		ZLib
+	)
+
+	if use test; then
+		cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
+	else
+		rm -fr 3rdParty || die
+	fi
 }
 
 src_configure() {
@@ -101,7 +127,6 @@ src_configure() {
 		cc="$(tc-getCC)"
 		ccache="no"
 		ccflags="${CFLAGS}"
-		CPPUNIT_FLAGS="QA"
 		coverage="no"
 		cxx="$(tc-getCXX)"
 		cxxflags="${CXXFLAGS}"
@@ -151,7 +176,11 @@ src_compile() {
 }
 
 src_test() {
-	escons test=unit QA
+	MYSCONS=(
+		V="1"
+	)
+
+	escons "${MYSCONS[@]}" test=unit QA
 }
 
 src_install() {
@@ -166,9 +195,9 @@ src_install() {
 
 	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
 
-	use client && newbin Slimber/CLI/slimber slimber-cli
-	use client && newbin Slimber/Qt/slimber slimber-qt
 	use zeroconf && dobin Limber/limber
+	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
+	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
 
 	einstalldocs
 }