diff --git a/.gitignore b/.gitignore
index 438e311..a97681f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,15 +54,16 @@
 tools/sdptool
 cups/bluetooth
 test/agent
-test/attest
 test/bdaddr
 test/hciemu
+test/attest
 test/hstest
+test/avtest
 test/l2test
-test/lmptest
 test/rctest
 test/scotest
 test/sdptest
+test/lmptest
 test/btiotest
 rfcomm/rfcomm
 compat/dund
diff --git a/test/Makefile.am b/test/Makefile.am
index bfd8f9d..a9247a0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,7 +4,8 @@
 
 bin_PROGRAMS = l2test rctest
 
-noinst_PROGRAMS = sdptest scotest attest hstest bdaddr lmptest agent btiotest
+noinst_PROGRAMS = sdptest scotest attest hstest avtest lmptest \
+						bdaddr agent btiotest
 
 hciemu_LDADD = $(top_builddir)/common/libhelper.a \
 			@GLIB_LIBS@ @BLUEZ_LIBS@
@@ -21,6 +22,8 @@
 
 hstest_LDADD = @BLUEZ_LIBS@
 
+avtest_LDADD = @BLUEZ_LIBS@
+
 bdaddr_SOURCES = bdaddr.c
 
 bdaddr_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
diff --git a/test/avtest.c b/test/avtest.c
new file mode 100644
index 0000000..6ec6035
--- /dev/null
+++ b/test/avtest.c
@@ -0,0 +1,31 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2007-2009  Marcel Holtmann <marcel@holtmann.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 St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+int main(int argc, char *argv[])
+{
+	return 0;
+}