diff --git a/media-libs/libmpdclient/libmpdclient-2.14.recipe b/media-libs/libmpdclient/libmpdclient-2.14.recipe
index 48a5a5f8d..51bc50f46 100644
--- a/media-libs/libmpdclient/libmpdclient-2.14.recipe
+++ b/media-libs/libmpdclient/libmpdclient-2.14.recipe
@@ -5,7 +5,7 @@ of sound files while being controlled by its network protocol."
 HOMEPAGE="https://www.musicpd.org/"
 COPYRIGHT="2003-2018 The Music Player Daemon Project"
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/MusicPlayerDaemon/libmpdclient/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="262f1ff13e6ee11cca2ef93f2eda10ec6953a7b8e628572645e707fe530fbbb6"
 SOURCE_FILENAME="libmpdclient-$portVersion.tar.gz"
@@ -34,6 +34,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libcheck$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:doxygen
@@ -43,6 +44,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:meson
 	cmd:ninja
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 defineDebugInfoPackage libmpdclient$secondaryArchSuffix \
@@ -56,7 +58,10 @@ BUILD()
 	export LDFLAGS="-lnetwork"
 	meson --prefix=$prefix \
 		--libdir=$libDir \
-		--includedir=$includeDir
+		--includedir=$includeDir \
+		--mandir=$manDir \
+		--infodir=$infoDir \
+		-Dtest=true
 
 	ninja $jobArgs
 }
@@ -78,3 +83,9 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
+
+TEST()
+{
+	cd build_haiku
+	ninja test
+}
diff --git a/media-sound/mpd/mpd-0.20.18.recipe b/media-sound/mpd/mpd-0.20.18.recipe
index 82e94c482..c0a19df79 100644
--- a/media-sound/mpd/mpd-0.20.18.recipe
+++ b/media-sound/mpd/mpd-0.20.18.recipe
@@ -5,7 +5,7 @@ variety of sound files while being controlled by its network protocol."
 HOMEPAGE="https://www.musicpd.org/"
 COPYRIGHT="2003-2018 The Music Player Daemon Project"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://www.musicpd.org/download/mpd/0.20/mpd-$portVersion.tar.xz"
 CHECKSUM_SHA256="6a582dc2ae90b94ff3853f9ffd7d80b2c2b5fe2e2c35cb1da0b36f3f3dfad434"
 PATCHES="mpd-$portVersion.patchset"
@@ -93,6 +93,7 @@ BUILD_REQUIRES="
 	devel:libcdio$secondaryArchSuffix
 #	devel:libcdio_paranoia$secondaryArchSuffix
 	devel:libcdio$secondaryArchSuffix
+	devel:libcppunit$secondaryArchSuffix
 	devel:libcurl$secondaryArchSuffix
 #	devel:ldns_sd$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
@@ -155,7 +156,9 @@ defineDebugInfoPackage mpd$secondaryArchSuffix \
 
 BUILD()
 {
-	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--enable-test
 
 	make $jobArgs
 }