diff --git a/config.d/ac_config_files.m4 b/config.d/ac_config_files.m4
index 4cd10d443..80321e545 100644
--- a/config.d/ac_config_files.m4
+++ b/config.d/ac_config_files.m4
@@ -7,6 +7,7 @@
 	libs/audio/Makefile
 	libs/audio/targets/Makefile
 	libs/audio/renderer/Makefile
+	libs/audio/test/Makefile
 	libs/console/Makefile
 	libs/gamecode/Makefile
 	libs/gamecode/engine/Makefile
diff --git a/libs/audio/Makefile.am b/libs/audio/Makefile.am
index f8e8b78bb..5db95f3b3 100644
--- a/libs/audio/Makefile.am
+++ b/libs/audio/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
-SUBDIRS= targets renderer 
+SUBDIRS= targets renderer test
 CFLAGS+= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 SDL_LIBS= @SDL_LIBS@
@@ -9,12 +9,6 @@ plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
 plugin_libadd= @plugin_libadd@
 EXEEXT=
 
-noinst_PROGRAMS= testsound
-
-testsound_SOURCES= testsound.c
-testsound_LDADD= libQFsound.la $(top_builddir)/libs/util/libQFutil.la
-testsound_DEPENDENCIES= libQFsound.la $(top_builddir)/libs/util/libQFutil.la
-
 plugin_LTLIBRARIES=	@CD_PLUGIN_TARGETS@
 noinst_LTLIBRARIES=	@CD_PLUGIN_STATIC@
 lib_LTLIBRARIES=	@CD_TARGETS@ @SND_TARGETS@
diff --git a/libs/audio/test/Makefile.am b/libs/audio/test/Makefile.am
new file mode 100644
index 000000000..91d45a2f8
--- /dev/null
+++ b/libs/audio/test/Makefile.am
@@ -0,0 +1,9 @@
+AUTOMAKE_OPTIONS= foreign
+
+INCLUDES= -I$(top_srcdir)/include
+
+noinst_PROGRAMS= testsound
+
+testsound_SOURCES= testsound.c
+testsound_LDADD= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/util/libQFutil.la
+testsound_DEPENDENCIES= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/util/libQFutil.la
diff --git a/libs/audio/testsound.c b/libs/audio/test/testsound.c
similarity index 100%
rename from libs/audio/testsound.c
rename to libs/audio/test/testsound.c