diff --git a/configure.ac b/configure.ac
index 3ad974a664..394d824c52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1004,6 +1004,7 @@ tests/Makefile
 tests/check/Makefile
 tests/examples/Makefile
 tests/examples/app/Makefile
+tests/examples/audio/Makefile
 tests/examples/dynamic/Makefile
 tests/examples/encoding/Makefile
 tests/examples/gio/Makefile
diff --git a/gst-libs/gst/audio/.gitignore b/gst-libs/gst/audio/.gitignore
index 1b3d8d62e5..b8de70e580 100644
--- a/gst-libs/gst/audio/.gitignore
+++ b/gst-libs/gst/audio/.gitignore
@@ -1,4 +1,4 @@
 libgstaudio_la-multichannel-enumtypes.lo
 audio-enumtypes.c
 audio-enumtypes.h
-testchannels
+
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 7977f89806..62f7b15176 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -52,11 +52,6 @@ libgstaudio_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \
   $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la
 libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
-noinst_PROGRAMS = testchannels
-testchannels_SOURCES = testchannels.c
-testchannels_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-testchannels_LDADD = $(GST_LIBS)
-
 include $(top_srcdir)/common/gst-glib-gen.mak
 
 if HAVE_INTROSPECTION
diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index 48c38a55c4..b78a06e7ed 100644
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -8,7 +8,7 @@ if USE_GIO
 GIO_SUBDIRS = gio
 endif
 
-SUBDIRS = app  dynamic $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay playrec volume v4l encoding
+SUBDIRS = app audio dynamic $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay playrec volume v4l encoding
 
 DIST_SUBDIRS = app dynamic gio overlay seek snapshot playrec volume v4l encoding
 
diff --git a/tests/examples/audio/.gitignore b/tests/examples/audio/.gitignore
new file mode 100644
index 0000000000..d066146478
--- /dev/null
+++ b/tests/examples/audio/.gitignore
@@ -0,0 +1 @@
+testchannels
diff --git a/tests/examples/audio/Makefile.am b/tests/examples/audio/Makefile.am
new file mode 100644
index 0000000000..f4a844abe6
--- /dev/null
+++ b/tests/examples/audio/Makefile.am
@@ -0,0 +1,6 @@
+
+noinst_PROGRAMS = testchannels
+testchannels_SOURCES = testchannels.c
+testchannels_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+testchannels_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_LIBS)
+
diff --git a/gst-libs/gst/audio/testchannels.c b/tests/examples/audio/testchannels.c
similarity index 95%
rename from gst-libs/gst/audio/testchannels.c
rename to tests/examples/audio/testchannels.c
index 53ca51d8e5..691bb587a6 100644
--- a/gst-libs/gst/audio/testchannels.c
+++ b/tests/examples/audio/testchannels.c
@@ -17,8 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "multichannel.c"
-#include "audio-enumtypes.c"
+#include <gst/audio/multichannel.h>
+#include <gst/audio/audio-enumtypes.h>
 
 gint
 main (gint argc, gchar * argv[])