diff --git a/tests/Makefile b/tests/Makefile
index 0def7e0dae..122ab3d821 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -90,6 +90,7 @@ include $(SRC_PATH)/tests/fate/acodec.mak
 include $(SRC_PATH)/tests/fate/vcodec.mak
 
 include $(SRC_PATH)/tests/fate/avformat.mak
+include $(SRC_PATH)/tests/fate/lavf-audio.mak
 include $(SRC_PATH)/tests/fate/lavf-image2pipe.mak
 include $(SRC_PATH)/tests/fate/seek.mak
 
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 2d5dbf2f47..e65184ba36 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -247,6 +247,7 @@ stream_remux(){
 # functions above and below that should be refactored.
 ffmpeg2="$target_exec ${target_path}/ffmpeg"
 raw_src="${target_path}/tests/vsynth1/%02d.pgm"
+pcm_src="${target_path}/tests/data/asynth1.sw"
 crcfile="tests/data/$test.lavf.crc"
 target_crcfile="${target_path}/$crcfile"
 
@@ -281,6 +282,14 @@ do_avconv_crc(){
     echo "$f $(cat $crcfile)"
 }
 
+lavf_audio(){
+    t="${test#lavf-}"
+    outdir="tests/data/lavf"
+    file=${outdir}/lavf.$t
+    do_avconv $file $DEC_OPTS $1 -ar 44100 -f s16le -i $pcm_src "$ENC_OPTS -metadata title=lavftest" -t 1 -qscale 10 $2
+    do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
+}
+
 lavf_image2pipe(){
     t="${test#lavf-}"
     t="${t%pipe}"
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index a0eaeefbe0..31d828d0e4 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -1,12 +1,7 @@
-FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             AIFF)               += aiff
-FATE_LAVF-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)           += alaw
 FATE_LAVF-$(call ENCDEC,  APNG,                  APNG)               += apng
 FATE_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)                += asf
-FATE_LAVF-$(call ENCDEC,  PCM_S16BE_PLANAR,      AST)                += ast
-FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             AU)                 += au
 FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       AVI)                += avi
 FATE_LAVF-$(call ENCDEC,  BMP,                   IMAGE2)             += bmp
-FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             CAF)                += caf
 FATE_LAVF-$(call ENCDEC,  DPX,                   IMAGE2)             += dpx
 FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)                += dv_fmt
 FATE_LAVF-$(call ENCDEC,  FITS,                  FITS)               += fits
@@ -14,14 +9,10 @@ FATE_LAVF-$(call ENCDEC,  RAWVIDEO,              FILMSTRIP)          += flm
 FATE_LAVF-$(call ENCDEC,  FLV,                   FLV)                += flv_fmt
 FATE_LAVF-$(call ENCDEC,  GIF,                   IMAGE2)             += gif
 FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF)                += gxf
-FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             IRCAM)              += ircam
 FATE_LAVF-$(call ENCDEC,  MJPEG,                 IMAGE2)             += jpg
-FATE_LAVF-$(call ENCMUX,  TTA,                   MATROSKA_AUDIO)     += mka
 FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       MATROSKA)           += mkv
-FATE_LAVF-$(call ENCDEC,  ADPCM_YAMAHA,          MMF)                += mmf
 FATE_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)                += mov ismv
 FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += mpg
-FATE_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)          += mulaw
 FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)                += mxf
 FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF)        += mxf_d10
 FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, MXF)                += mxf_dv25
@@ -29,31 +20,20 @@ FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, MXF)                += mxf_dvcp
 FATE_LAVF-$(call ENCDEC2, DNXHD,      PCM_S16LE, MXF_OPATOM MXF)     += mxf_opatom
 FATE_LAVF-$(call ENCDEC2, DNXHD,      PCM_S16LE, MXF_OPATOM MXF)     += mxf_opatom_audio
 FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)                += nut
-FATE_LAVF-$(call ENCDEC,  FLAC,                  OGG)                += ogg
 FATE_LAVF-$(call ENCDEC,  PAM,                   IMAGE2)             += pam
 FATE_LAVF-$(call ENCDEC,  PCX,                   IMAGE2)             += pcx
 FATE_LAVF-$(call ENCDEC,  PGM,                   IMAGE2)             += pgm
 FATE_LAVF-$(call ENCDEC,  PNG,                   IMAGE2)             += png
 FATE_LAVF-$(call ENCDEC,  PPM,                   IMAGE2)             += ppm
 FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)                 += rm
-FATE_LAVF-$(call ENCDEC,  PCM_U8,                RSO)                += rso
 FATE_LAVF-$(call ENCDEC,  SGI,                   IMAGE2)             += sgi
 FATE_LAVF-$(call ENCMUX,  MJPEG PCM_S16LE,       SMJPEG)             += smjpeg
-FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             SOX)                += sox
 FATE_LAVF-$(call ENCDEC,  SUNRAST,               IMAGE2)             += sunrast
 FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)                += swf
 FATE_LAVF-$(call ENCDEC,  TARGA,                 IMAGE2)             += tga
 FATE_LAVF-$(call ENCDEC,  TIFF,                  IMAGE2)             += tiff
 FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)             += ts
-FATE_LAVF-$(call ENCDEC,  TTA,                   TTA)                += tta
-FATE_LAVF-$(call ENCDEC,  PCM_U8,                VOC)                += voc
-FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             VOC)                += voc_s16
-FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)                += wav
-FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)                += wav_peak
-FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)                += wav_peak_only
-FATE_LAVF-$(call ENCMUX,  PCM_S16LE,             W64)                += w64
 FATE_LAVF-$(call ENCDEC,  MP2,                   WTV)                += wtv
-FATE_LAVF-$(call ENCDEC,  WAVPACK,               WV)                 += wv
 FATE_LAVF-$(call ENCDEC,  XBM,                   IMAGE2)             += xbm
 FATE_LAVF-$(call ENCDEC,  XWD,                   IMAGE2)             += xwd
 FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                               += yuv4mpeg
diff --git a/tests/fate/lavf-audio.mak b/tests/fate/lavf-audio.mak
new file mode 100644
index 0000000000..0be7a3a050
--- /dev/null
+++ b/tests/fate/lavf-audio.mak
@@ -0,0 +1,38 @@
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16BE,    AIFF)             += aiff
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_ALAW,     PCM_ALAW)         += al
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16BE_PLANAR, AST)          += ast
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16BE,    AU)               += au
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16BE,    CAF)              += caf
+FATE_LAVF_AUDIO-$(call ENCDEC,  ADPCM_YAMAHA, MMF)              += mmf
+FATE_LAVF_AUDIO-$(call ENCDEC,  FLAC,         OGG)              += ogg
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_U8,       RSO)              += rso
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    SOX)              += sox
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_MULAW,    PCM_MULAW)        += ul
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_U8,       VOC)              += voc
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    IRCAM)            += ircam
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    VOC)              += s16.voc
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    WAV)              += wav
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    WAV)              += peak.wav
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    WAV)              += peak_only.wav
+FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    W64)              += w64
+FATE_LAVF_AUDIO-$(call ENCDEC,  TTA,          TTA)              += tta
+FATE_LAVF_AUDIO-$(call ENCMUX,  TTA,          MATROSKA_AUDIO)   += mka
+FATE_LAVF_AUDIO-$(call ENCDEC,  WAVPACK,      WV)               += wv
+
+FATE_LAVF_AUDIO = $(FATE_LAVF_AUDIO-yes:%=fate-lavf-%)
+
+$(FATE_LAVF_AUDIO): CMD = lavf_audio
+$(FATE_LAVF_AUDIO): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
+$(FATE_LAVF_AUDIO): $(AREF)
+
+fate-lavf-al fate-lavf-ul: CMD = lavf_audio "" "" "-ar 44100"
+fate-lavf-ogg: CMD = lavf_audio "" "-c:a flac"
+fate-lavf-s16.voc: CMD = lavf_audio "-ac 2" "-c:a pcm_s16le"
+fate-lavf-ast: CMD = lavf_audio "-ac 2" "-loopstart 1 -loopend 10"
+fate-lavf-mka: CMD = lavf_audio "" "-c:a tta"
+fate-lavf-voc: CMD = lavf_audio "" "-c:a pcm_u8"
+fate-lavf-peak.wav: CMD = lavf_audio "" "-write_peak on"
+fate-lavf-peak_only.wav: CMD = lavf_audio "" "-write_peak only"
+
+FATE_AVCONV += $(FATE_LAVF_AUDIO)
+fate-lavf-audio fate-lavf: $(FATE_LAVF_AUDIO)
diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak
index 6a9f843d82..0df87d8982 100644
--- a/tests/fate/seek.mak
+++ b/tests/fate/seek.mak
@@ -162,7 +162,7 @@ FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA-yes:%=fate-seek-vsynth_lena-%)
 # files from fate-lavf
 
 FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16BE,             AIFF)        += aiff
-FATE_SEEK_LAVF-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)    += alaw
+FATE_SEEK_LAVF-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)    += al
 FATE_SEEK_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)         += asf
 FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16BE,             AU)          += au
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      MP2,       AVI)         += avi
@@ -176,7 +176,7 @@ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      MP2,       MATROSKA)    += mkv
 FATE_SEEK_LAVF-$(call ENCDEC,  ADPCM_YAMAHA,          MMF)         += mmf
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)         += mov
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += mpg
-FATE_SEEK_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)   += mulaw
+FATE_SEEK_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)   += ul
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)         += mxf
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
 FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, MXF)         += mxf_dv25
@@ -202,8 +202,8 @@ FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)         += wav
 FATE_SEEK_LAVF-$(call ENCDEC,  MP2,                   WTV)         += wtv
 FATE_SEEK_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                        += yuv4mpeg
 
-fate-seek-lavf-aiff:     SRC = lavf/lavf.aif
-fate-seek-lavf-alaw:     SRC = lavf/lavf.al
+fate-seek-lavf-aiff:     SRC = lavf/lavf.aiff
+fate-seek-lavf-al:       SRC = lavf/lavf.al
 fate-seek-lavf-asf:      SRC = lavf/lavf.asf
 fate-seek-lavf-au:       SRC = lavf/lavf.au
 fate-seek-lavf-avi:      SRC = lavf/lavf.avi
@@ -217,7 +217,7 @@ fate-seek-lavf-mkv:      SRC = lavf/lavf.mkv
 fate-seek-lavf-mmf:      SRC = lavf/lavf.mmf
 fate-seek-lavf-mov:      SRC = lavf/lavf.mov
 fate-seek-lavf-mpg:      SRC = lavf/lavf.mpg
-fate-seek-lavf-mulaw:    SRC = lavf/lavf.ul
+fate-seek-lavf-ul:       SRC = lavf/lavf.ul
 fate-seek-lavf-mxf:      SRC = lavf/lavf.mxf
 fate-seek-lavf-mxf_d10:  SRC = lavf/lavf.mxf_d10
 fate-seek-lavf-mxf_dv25: SRC = lavf/lavf.mxf_dv25
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index baf2dc76a5..f516290722 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -50,13 +50,6 @@ do_image_formats()
     echo $(wc -c ${outfile}02.$1)
 }
 
-do_audio_only()
-{
-    file=${outfile}lavf.$1
-    do_avconv $file $DEC_OPTS $2 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $3
-    do_avconv_crc $file $DEC_OPTS $4 -i $target_path/$file
-}
-
 if [ -n "$do_avi" ] ; then
 do_lavf avi "" "-acodec mp2 -ar 44100 -ab 64k -threads 1"
 fi
@@ -146,10 +139,6 @@ if [ -n "$do_nut" ] ; then
 do_lavf nut "" "-acodec mp2 -ab 64k -ar 44100 -threads 1"
 fi
 
-if [ -n "$do_mka" ] ; then
-do_audio_only mka "" "-c:a tta"
-fi
-
 if [ -n "$do_mkv" ] ; then
 do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 \
  -attach ${raw_src%/*}/00.pgm -metadata:s:t mimetype=image/x-portable-greymap -threads 1"
@@ -305,89 +294,10 @@ if [ -n "$do_sunrast" ] ; then
 do_image_formats sun
 fi
 
-# audio only
-
-if [ -n "$do_wav" ] ; then
-do_audio_only wav
-fi
-
-if [ -n "$do_wav_peak" ] ; then
-do_audio_only peak.wav "" "-write_peak on"
-fi
-
-if [ -n "$do_wav_peak_only" ] ; then
-file=${outfile}lavf.peak_only.wav
-do_avconv $file $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -write_peak only
-fi
-
-if [ -n "$do_alaw" ] ; then
-do_audio_only al "" "" "-ar 44100"
-fi
-
-if [ -n "$do_mulaw" ] ; then
-do_audio_only ul "" "" "-ar 44100"
-fi
-
-if [ -n "$do_au" ] ; then
-do_audio_only au
-fi
-
-if [ -n "$do_mmf" ] ; then
-do_audio_only mmf
-fi
-
-if [ -n "$do_aiff" ] ; then
-do_audio_only aif
-fi
-
-if [ -n "$do_voc" ] ; then
-do_audio_only voc "" "-acodec pcm_u8"
-fi
-
-if [ -n "$do_voc_s16" ] ; then
-do_audio_only s16.voc "-ac 2" "-acodec pcm_s16le"
-fi
-
-if [ -n "$do_ogg" ] ; then
-do_audio_only ogg "" "-c:a flac"
-fi
-
-if [ -n "$do_rso" ] ; then
-do_audio_only rso
-fi
-
 if [ -n "$do_smjpeg" ] ; then
 do_lavf smjpeg "" "-f smjpeg"
 fi
 
-if [ -n "$do_sox" ] ; then
-do_audio_only sox
-fi
-
-if [ -n "$do_tta" ] ; then
-do_audio_only tta
-fi
-
-if [ -n "$do_caf" ] ; then
-do_audio_only caf
-fi
-
-if [ -n "$do_ast" ] ; then
-do_audio_only ast "-ac 2" "-loopstart 1 -loopend 10"
-fi
-
-if [ -n "$do_ircam" ] ; then
-do_audio_only ircam
-fi
-
-if [ -n "$do_w64" ] ; then
-do_audio_only w64
-fi
-
-if [ -n "$do_wv" ] ; then
-do_audio_only wv
-fi
-
 # pix_fmt conversions
 
 if [ -n "$do_pixfmt" ] ; then
diff --git a/tests/ref/lavf/aiff b/tests/ref/lavf/aiff
index c504c18c4a..d72ec85150 100644
--- a/tests/ref/lavf/aiff
+++ b/tests/ref/lavf/aiff
@@ -1,3 +1,3 @@
-2c129d88acef834e32869145fe792b9c *./tests/data/lavf/lavf.aif
-88270 ./tests/data/lavf/lavf.aif
-./tests/data/lavf/lavf.aif CRC=0x3a1da17e
+2c129d88acef834e32869145fe792b9c *tests/data/lavf/lavf.aiff
+88270 tests/data/lavf/lavf.aiff
+tests/data/lavf/lavf.aiff CRC=0x3a1da17e
diff --git a/tests/ref/lavf/al b/tests/ref/lavf/al
new file mode 100644
index 0000000000..c383c36284
--- /dev/null
+++ b/tests/ref/lavf/al
@@ -0,0 +1,3 @@
+652d96e474869ddb01403743deb35117 *tests/data/lavf/lavf.al
+44100 tests/data/lavf/lavf.al
+tests/data/lavf/lavf.al CRC=0xf9643112
diff --git a/tests/ref/lavf/alaw b/tests/ref/lavf/alaw
deleted file mode 100644
index d93d6fc0ee..0000000000
--- a/tests/ref/lavf/alaw
+++ /dev/null
@@ -1,3 +0,0 @@
-652d96e474869ddb01403743deb35117 *./tests/data/lavf/lavf.al
-44100 ./tests/data/lavf/lavf.al
-./tests/data/lavf/lavf.al CRC=0xf9643112
diff --git a/tests/ref/lavf/ast b/tests/ref/lavf/ast
index 513c612e76..2f2e8de46f 100644
--- a/tests/ref/lavf/ast
+++ b/tests/ref/lavf/ast
@@ -1,3 +1,3 @@
-07f5d23aa8bade984034f7005bd72947 *./tests/data/lavf/lavf.ast
-177872 ./tests/data/lavf/lavf.ast
-./tests/data/lavf/lavf.ast CRC=0xe61e3bd0
+07f5d23aa8bade984034f7005bd72947 *tests/data/lavf/lavf.ast
+177872 tests/data/lavf/lavf.ast
+tests/data/lavf/lavf.ast CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/au b/tests/ref/lavf/au
index dcd02f335c..4abedf3095 100644
--- a/tests/ref/lavf/au
+++ b/tests/ref/lavf/au
@@ -1,3 +1,3 @@
-5228ad3783888c45a08dac5ab6118794 *./tests/data/lavf/lavf.au
-88240 ./tests/data/lavf/lavf.au
-./tests/data/lavf/lavf.au CRC=0x3a1da17e
+5228ad3783888c45a08dac5ab6118794 *tests/data/lavf/lavf.au
+88240 tests/data/lavf/lavf.au
+tests/data/lavf/lavf.au CRC=0x3a1da17e
diff --git a/tests/ref/lavf/caf b/tests/ref/lavf/caf
index 7b2a67d1c0..8488f3fee2 100644
--- a/tests/ref/lavf/caf
+++ b/tests/ref/lavf/caf
@@ -1,3 +1,3 @@
-c3c38cba600722c87c0e75bd0688b7fc *./tests/data/lavf/lavf.caf
-88323 ./tests/data/lavf/lavf.caf
-./tests/data/lavf/lavf.caf CRC=0x3a1da17e
+c3c38cba600722c87c0e75bd0688b7fc *tests/data/lavf/lavf.caf
+88323 tests/data/lavf/lavf.caf
+tests/data/lavf/lavf.caf CRC=0x3a1da17e
diff --git a/tests/ref/lavf/ircam b/tests/ref/lavf/ircam
index 47e07098e5..7a17fb232b 100644
--- a/tests/ref/lavf/ircam
+++ b/tests/ref/lavf/ircam
@@ -1,3 +1,3 @@
-45d9a4667030e95d1d8fb6ab012f1aa0 *./tests/data/lavf/lavf.ircam
-89224 ./tests/data/lavf/lavf.ircam
-./tests/data/lavf/lavf.ircam CRC=0x3a1da17e
+45d9a4667030e95d1d8fb6ab012f1aa0 *tests/data/lavf/lavf.ircam
+89224 tests/data/lavf/lavf.ircam
+tests/data/lavf/lavf.ircam CRC=0x3a1da17e
diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka
index ac0f6cf316..87f5ad8c97 100644
--- a/tests/ref/lavf/mka
+++ b/tests/ref/lavf/mka
@@ -1,3 +1,3 @@
-2d9722c0691e140237af0036e3a178b0 *./tests/data/lavf/lavf.mka
-43684 ./tests/data/lavf/lavf.mka
-./tests/data/lavf/lavf.mka CRC=0x3a1da17e
+2d9722c0691e140237af0036e3a178b0 *tests/data/lavf/lavf.mka
+43684 tests/data/lavf/lavf.mka
+tests/data/lavf/lavf.mka CRC=0x3a1da17e
diff --git a/tests/ref/lavf/mmf b/tests/ref/lavf/mmf
index fae95cadd5..36094bc900 100644
--- a/tests/ref/lavf/mmf
+++ b/tests/ref/lavf/mmf
@@ -1,3 +1,3 @@
-643fadf7482f6d937ed75ec4f508e4f1 *./tests/data/lavf/lavf.mmf
-22611 ./tests/data/lavf/lavf.mmf
-./tests/data/lavf/lavf.mmf CRC=0x8dea1388
+643fadf7482f6d937ed75ec4f508e4f1 *tests/data/lavf/lavf.mmf
+22611 tests/data/lavf/lavf.mmf
+tests/data/lavf/lavf.mmf CRC=0x8dea1388
diff --git a/tests/ref/lavf/mulaw b/tests/ref/lavf/mulaw
deleted file mode 100644
index bd540847de..0000000000
--- a/tests/ref/lavf/mulaw
+++ /dev/null
@@ -1,3 +0,0 @@
-ad492935e361f830f2f8302aa102701d *./tests/data/lavf/lavf.ul
-44100 ./tests/data/lavf/lavf.ul
-./tests/data/lavf/lavf.ul CRC=0x4515fa26
diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg
index a08fb5ed82..3ac10e6f7c 100644
--- a/tests/ref/lavf/ogg
+++ b/tests/ref/lavf/ogg
@@ -1,3 +1,3 @@
-81b9366cacb23644c2803585dced9996 *./tests/data/lavf/lavf.ogg
-13516 ./tests/data/lavf/lavf.ogg
-./tests/data/lavf/lavf.ogg CRC=0x3a1da17e
+81b9366cacb23644c2803585dced9996 *tests/data/lavf/lavf.ogg
+13516 tests/data/lavf/lavf.ogg
+tests/data/lavf/lavf.ogg CRC=0x3a1da17e
diff --git a/tests/ref/lavf/peak.wav b/tests/ref/lavf/peak.wav
new file mode 100644
index 0000000000..573d53221f
--- /dev/null
+++ b/tests/ref/lavf/peak.wav
@@ -0,0 +1,3 @@
+105805963fb767d00da056f42f32d9f3 *tests/data/lavf/lavf.peak.wav
+89094 tests/data/lavf/lavf.peak.wav
+tests/data/lavf/lavf.peak.wav CRC=0x3a1da17e
diff --git a/tests/ref/lavf/peak_only.wav b/tests/ref/lavf/peak_only.wav
new file mode 100644
index 0000000000..c468731b00
--- /dev/null
+++ b/tests/ref/lavf/peak_only.wav
@@ -0,0 +1,3 @@
+f1a8aeeae8069f3992c4d780436c3d23 *tests/data/lavf/lavf.peak_only.wav
+832 tests/data/lavf/lavf.peak_only.wav
+tests/data/lavf/lavf.peak_only.wav
diff --git a/tests/ref/lavf/rso b/tests/ref/lavf/rso
index 5878f434a1..6b2f03e181 100644
--- a/tests/ref/lavf/rso
+++ b/tests/ref/lavf/rso
@@ -1,3 +1,3 @@
-443b72346065d6318ca18c8395aa1d87 *./tests/data/lavf/lavf.rso
-44108 ./tests/data/lavf/lavf.rso
-./tests/data/lavf/lavf.rso CRC=0x298fd284
+443b72346065d6318ca18c8395aa1d87 *tests/data/lavf/lavf.rso
+44108 tests/data/lavf/lavf.rso
+tests/data/lavf/lavf.rso CRC=0x298fd284
diff --git a/tests/ref/lavf/s16.voc b/tests/ref/lavf/s16.voc
new file mode 100644
index 0000000000..9b17a4c9b9
--- /dev/null
+++ b/tests/ref/lavf/s16.voc
@@ -0,0 +1,3 @@
+db9fa22ff71992bd8b6cc80047223c92 *tests/data/lavf/lavf.s16.voc
+176615 tests/data/lavf/lavf.s16.voc
+tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/sox b/tests/ref/lavf/sox
index fc368b1357..fc3953e128 100644
--- a/tests/ref/lavf/sox
+++ b/tests/ref/lavf/sox
@@ -1,3 +1,3 @@
-683635d5cb1344e44fa96df90c3a993c *./tests/data/lavf/lavf.sox
-176432 ./tests/data/lavf/lavf.sox
-./tests/data/lavf/lavf.sox CRC=0x3a1da17e
+683635d5cb1344e44fa96df90c3a993c *tests/data/lavf/lavf.sox
+176432 tests/data/lavf/lavf.sox
+tests/data/lavf/lavf.sox CRC=0x3a1da17e
diff --git a/tests/ref/lavf/tta b/tests/ref/lavf/tta
index d86d097e3d..f6fe9d84ff 100644
--- a/tests/ref/lavf/tta
+++ b/tests/ref/lavf/tta
@@ -1,3 +1,3 @@
-d86c5cccb2554143d34d1786ab460a31 *./tests/data/lavf/lavf.tta
-43200 ./tests/data/lavf/lavf.tta
-./tests/data/lavf/lavf.tta CRC=0x3a1da17e
+d86c5cccb2554143d34d1786ab460a31 *tests/data/lavf/lavf.tta
+43200 tests/data/lavf/lavf.tta
+tests/data/lavf/lavf.tta CRC=0x3a1da17e
diff --git a/tests/ref/lavf/ul b/tests/ref/lavf/ul
new file mode 100644
index 0000000000..cf025937b3
--- /dev/null
+++ b/tests/ref/lavf/ul
@@ -0,0 +1,3 @@
+ad492935e361f830f2f8302aa102701d *tests/data/lavf/lavf.ul
+44100 tests/data/lavf/lavf.ul
+tests/data/lavf/lavf.ul CRC=0x4515fa26
diff --git a/tests/ref/lavf/voc b/tests/ref/lavf/voc
index ded8af7227..0ac933e2f1 100644
--- a/tests/ref/lavf/voc
+++ b/tests/ref/lavf/voc
@@ -1,3 +1,3 @@
-bb5ad96a5e1b35683d50bf18115db821 *./tests/data/lavf/lavf.voc
-44305 ./tests/data/lavf/lavf.voc
-./tests/data/lavf/lavf.voc CRC=0x298fd284
+bb5ad96a5e1b35683d50bf18115db821 *tests/data/lavf/lavf.voc
+44305 tests/data/lavf/lavf.voc
+tests/data/lavf/lavf.voc CRC=0x298fd284
diff --git a/tests/ref/lavf/voc_s16 b/tests/ref/lavf/voc_s16
deleted file mode 100644
index d026090aff..0000000000
--- a/tests/ref/lavf/voc_s16
+++ /dev/null
@@ -1,3 +0,0 @@
-db9fa22ff71992bd8b6cc80047223c92 *./tests/data/lavf/lavf.s16.voc
-176615 ./tests/data/lavf/lavf.s16.voc
-./tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/w64 b/tests/ref/lavf/w64
index 26c68688e5..2b6bc23aef 100644
--- a/tests/ref/lavf/w64
+++ b/tests/ref/lavf/w64
@@ -1,3 +1,3 @@
-82c75c9cb61924fda68d9602ea69c445 *./tests/data/lavf/lavf.w64
-88304 ./tests/data/lavf/lavf.w64
-./tests/data/lavf/lavf.w64 CRC=0x3a1da17e
+82c75c9cb61924fda68d9602ea69c445 *tests/data/lavf/lavf.w64
+88304 tests/data/lavf/lavf.w64
+tests/data/lavf/lavf.w64 CRC=0x3a1da17e
diff --git a/tests/ref/lavf/wav b/tests/ref/lavf/wav
index da3bfc24ed..0540eab07c 100644
--- a/tests/ref/lavf/wav
+++ b/tests/ref/lavf/wav
@@ -1,3 +1,3 @@
-fc958a32b4fca7b1c40cbdaef2d1416e *./tests/data/lavf/lavf.wav
-88274 ./tests/data/lavf/lavf.wav
-./tests/data/lavf/lavf.wav CRC=0x3a1da17e
+fc958a32b4fca7b1c40cbdaef2d1416e *tests/data/lavf/lavf.wav
+88274 tests/data/lavf/lavf.wav
+tests/data/lavf/lavf.wav CRC=0x3a1da17e
diff --git a/tests/ref/lavf/wav_peak b/tests/ref/lavf/wav_peak
deleted file mode 100644
index 861b246d72..0000000000
--- a/tests/ref/lavf/wav_peak
+++ /dev/null
@@ -1,3 +0,0 @@
-105805963fb767d00da056f42f32d9f3 *./tests/data/lavf/lavf.peak.wav
-89094 ./tests/data/lavf/lavf.peak.wav
-./tests/data/lavf/lavf.peak.wav CRC=0x3a1da17e
diff --git a/tests/ref/lavf/wav_peak_only b/tests/ref/lavf/wav_peak_only
deleted file mode 100644
index b203d0345b..0000000000
--- a/tests/ref/lavf/wav_peak_only
+++ /dev/null
@@ -1,2 +0,0 @@
-f1a8aeeae8069f3992c4d780436c3d23 *./tests/data/lavf/lavf.peak_only.wav
-832 ./tests/data/lavf/lavf.peak_only.wav
diff --git a/tests/ref/lavf/wv b/tests/ref/lavf/wv
index 323c5df6d5..07205093f3 100644
--- a/tests/ref/lavf/wv
+++ b/tests/ref/lavf/wv
@@ -1,3 +1,3 @@
-47d9a381d9c3f99b8b059f3b17f1dc11 *./tests/data/lavf/lavf.wv
-59560 ./tests/data/lavf/lavf.wv
-./tests/data/lavf/lavf.wv CRC=0x3a1da17e
+47d9a381d9c3f99b8b059f3b17f1dc11 *tests/data/lavf/lavf.wv
+59560 tests/data/lavf/lavf.wv
+tests/data/lavf/lavf.wv CRC=0x3a1da17e
diff --git a/tests/ref/seek/lavf-alaw b/tests/ref/seek/lavf-al
similarity index 100%
rename from tests/ref/seek/lavf-alaw
rename to tests/ref/seek/lavf-al
diff --git a/tests/ref/seek/lavf-mulaw b/tests/ref/seek/lavf-ul
similarity index 100%
rename from tests/ref/seek/lavf-mulaw
rename to tests/ref/seek/lavf-ul