diff --git a/Makefile.am b/Makefile.am
index 75106ac71..67e5b2454 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1068,6 +1068,10 @@ noinst_PROGRAMS = \
 	test/run_normalize \
 	test/software_volume
 
+if HAVE_AVAHI
+noinst_PROGRAMS += test/run_avahi
+endif
+
 if ENABLE_ARCHIVE
 noinst_PROGRAMS += test/visit_archive
 endif
@@ -1340,6 +1344,18 @@ test_software_volume_LDADD = \
 	libutil.a \
 	$(GLIB_LIBS)
 
+test_run_avahi_SOURCES = \
+	src/Log.cxx \
+	src/ZeroconfAvahi.cxx \
+	test/ShutdownHandler.cxx test/ShutdownHandler.hxx \
+	test/run_avahi.cxx
+test_run_avahi_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(AVAHI_CFLAGS)
+test_run_avahi_LDADD = \
+	libevent.a \
+	libsystem.a \
+	$(AVAHI_LIBS)
+
 test_run_normalize_SOURCES = test/run_normalize.cxx \
 	test/stdbin.h \
 	src/CheckAudioFormat.cxx \
diff --git a/test/run_avahi.cxx b/test/run_avahi.cxx
new file mode 100644
index 000000000..b392edb6d
--- /dev/null
+++ b/test/run_avahi.cxx
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "event/Loop.hxx"
+#include "ShutdownHandler.hxx"
+#include "ZeroconfAvahi.hxx"
+
+#include <stdlib.h>
+
+unsigned listen_port = 1234;
+
+int
+main(gcc_unused int argc, gcc_unused char **argv)
+{
+	EventLoop event_loop((EventLoop::Default()));
+	const ShutdownHandler shutdown_handler(event_loop);
+
+	AvahiInit(event_loop, "test");
+
+	event_loop.Run();
+
+	AvahiDeinit();
+
+	return EXIT_SUCCESS;
+}