diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 1b888ce14..c324b28aa 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -354,7 +354,7 @@ QF_PROCESS_NEED_LIBS(nq, [client common sdl win server], [nq/source], a)
 if test -n "$CL_TARGETS"; then
 	CD_TARGETS="libs/audio/libQFcd.la"
 	SND_TARGETS="libs/audio/libQFsound.la"
-	AUDIO_TARGETS="testsound\$(EXEEXT)"
+	AUDIO_TARGETS="libs/audio/test/testsound\$(EXEEXT)"
 	JOY_TARGETS="libs/video/targets/libQFjs.la"
 else
 	unset CDTYPE
diff --git a/libs/audio/Makemodule.am b/libs/audio/Makemodule.am
index c649c7351..8c371c680 100644
--- a/libs/audio/Makemodule.am
+++ b/libs/audio/Makemodule.am
@@ -1,5 +1,6 @@
 include libs/audio/targets/Makemodule.am
 include libs/audio/renderer/Makemodule.am
+include libs/audio/test/Makemodule.am
 
 plugin_LTLIBRARIES +=	@cd_plugins@
 noinst_LTLIBRARIES +=	@cd_static_plugins@
diff --git a/libs/audio/test/Makefile.am b/libs/audio/test/Makefile.am
deleted file mode 100644
index ff6d259a4..000000000
--- a/libs/audio/test/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_PROGRAMS= @AUDIO_TARGETS@
-
-EXTRA_PROGRAMS= testsound
-
-test_libs= \
-	libs/audio/libQFsound.la \
-	libs/ruamoko/libQFruamoko.la \
-	libs/util/libQFutil.la
-
-testsound_SOURCES=		testsound.c
-testsound_LDADD=		$(test_libs)
-testsound_DEPENDENCIES=	$(test_libs)
diff --git a/libs/audio/test/Makemodule.am b/libs/audio/test/Makemodule.am
new file mode 100644
index 000000000..e1a4800b0
--- /dev/null
+++ b/libs/audio/test/Makemodule.am
@@ -0,0 +1,12 @@
+noinst_PROGRAMS += @AUDIO_TARGETS@
+
+EXTRA_PROGRAMS += libs/audio/test/testsound
+
+testaudio_libs= \
+	libs/audio/libQFsound.la \
+	libs/ruamoko/libQFruamoko.la \
+	libs/util/libQFutil.la
+
+libs_audio_test_testsound_SOURCES=		libs/audio/test/testsound.c
+libs_audio_test_testsound_LDADD=		$(testaudio_libs)
+libs_audio_test_testsound_DEPENDENCIES=	$(testaudio_libs)
diff --git a/libs/audio/test/testsound.c b/libs/audio/test/testsound.c
index 698fc40ec..b513df3cf 100644
--- a/libs/audio/test/testsound.c
+++ b/libs/audio/test/testsound.c
@@ -65,7 +65,7 @@ init (void)
 	testsound_args = Cbuf_ArgsNew ();
 
 	Sys_Init ();
-	COM_ParseConfig ();
+	COM_ParseConfig (testsound_cbuf);
 	Cvar_Get ("cmd_warncmd", "1", CVAR_NONE, NULL, NULL);
 
 	Memory_Init (Sys_Alloc (MEMSIZE), MEMSIZE);