diff --git a/dev-cpp/xdgcfg/Manifest b/dev-cpp/xdgcfg/Manifest
index fe322df66..9b1eb9a75 100644
--- a/dev-cpp/xdgcfg/Manifest
+++ b/dev-cpp/xdgcfg/Manifest
@@ -2,12 +2,12 @@
 Hash: SHA256
 
 DIST 0.4.0.tar.gz 6361 BLAKE2B f597efdba123dfbf58680d5aa7b00c8120920569cd79e23e3f0ea2a8fa152600a0720719bea572d41ac72b51434193cfa2153fb96f9cb933057a6f65864ac70e SHA512 7232e9cab350155f2830b85615222ffe5146d8508d20c276e9e242cf08eec2398ce523ce469a7c0b3f18d631c58790c9533904630576a462d74f1c14e77d9dfe
-EBUILD xdgcfg-0.4.0.ebuild 903 BLAKE2B c32fd4542c098060defe1e1e4ec631214d8150a88e39ded2ee2b4168c1251f7e71020ae7eef1cde1f67602b859f0ec706f86e128ceab031b3105a711a649b929 SHA512 8316430533d928e5345c56098f1541df8856378a56d447497185ba5df696ee1bcc1329c312aa59f6bddc7ab23a1bf4bdf45df7855fb8473f3d8c3b41162946f0
+EBUILD xdgcfg-0.4.0.ebuild 1068 BLAKE2B beffab301878a1e6485358cfa26460fd2a31220ecefc28aacea18968e7ce39055b22e948ad5b7f2ddb514e627accb626e6076be6d9a7630d032362ba3b048080 SHA512 0c3ecd53ca1c2fda178c401b938cedae67c7d7ca014e7b27d7452c456c5755763d5dbb4b4c6575dc736c6433b75fc9ff566ee17f93550729958e7f86d540fc48
 MISC metadata.xml 517 BLAKE2B 92b4f4a82d463c752b950c01cfab624fc5d5f0fd2d2ef396fe4536fea8a325e07b92b7a38d76dcb59d5deab719cb7f31fad737cb879a787d7c866463a75064ff SHA512 14e1823026bee1e15f1f2cbf066bcd229ce4e54c713835b00f48bf034e7994372cb769b552403b00999a4f2e0ebeb9a6b95e0e3e1e00a9efc2724ea3af9c0039
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXUPpzAAKCRDPw5SX8bJu
-BzvaAP0UEYrXNE16LJloUE4xOgXfjqI9HCnyqgq5ZNcDzQGTFAD/cMBgxqpzBHdR
-rvp3oGVMzKHXb/Gac8Fjnl2BLGKkBOk=
-=GbZw
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXUP6nwAKCRDPw5SX8bJu
+B+rlAP9uCgrg8nhSLl9rFAbFe9rkhmsX82wYSGqE+zyQjzb8SAD6Ankz4ASDZfOi
+L1aCVmRXhamvPe+T5SYap7iDhJEXntQ=
+=/gXK
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/xdgcfg/xdgcfg-0.4.0.ebuild b/dev-cpp/xdgcfg/xdgcfg-0.4.0.ebuild
index 75e33bca5..e10a347fe 100644
--- a/dev-cpp/xdgcfg/xdgcfg-0.4.0.ebuild
+++ b/dev-cpp/xdgcfg/xdgcfg-0.4.0.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${PN}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_TESTS="$(usex test)"
+		-DWITH_TESTS=$(usex test)
 	)
 
 	cmake-utils_src_configure
@@ -38,10 +38,15 @@ src_compile() {
 	cmake-utils_src_compile
 
 	if use doc; then
-		./build_doc.sh
+		./build_doc.sh || die "Generation of HTML documentation failed."
 	fi
 }
 
+src_test() {
+	cd "${BUILD_DIR}/tests" || die "Could not change to test directory."
+	ctest . || die "Test failed."
+}
+
 src_install() {
 	if use doc; then
 		HTML_DOCS="doc/html/*"