diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak
index 255479ad43..83b13b6323 100644
--- a/tests/fate/ac3.mak
+++ b/tests/fate/ac3.mak
@@ -1,29 +1,32 @@
-FATE_TESTS += fate-ac3-2.0
+FATE_AC3 += fate-ac3-2.0
 fate-ac3-2.0: CMD = pcm -i $(SAMPLES)/ac3/monsters_inc_2.0_192_small.ac3
 fate-ac3-2.0: CMP = oneoff
 fate-ac3-2.0: REF = $(SAMPLES)/ac3/monsters_inc_2.0_192_small.pcm
 
-FATE_TESTS += fate-ac3-5.1
+FATE_AC3 += fate-ac3-5.1
 fate-ac3-5.1: CMD = pcm -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
 fate-ac3-5.1: CMP = oneoff
 fate-ac3-5.1: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small.pcm
 
-FATE_TESTS += fate-eac3-1
+FATE_AC3 += fate-eac3-1
 fate-eac3-1: CMD = pcm -i $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small.eac3
 fate-eac3-1: CMP = oneoff
 fate-eac3-1: REF = $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small.pcm
 
-FATE_TESTS += fate-eac3-2
+FATE_AC3 += fate-eac3-2
 fate-eac3-2: CMD = pcm -i $(SAMPLES)/eac3/csi_miami_stereo_128_spx_small.eac3
 fate-eac3-2: CMP = oneoff
 fate-eac3-2: REF = $(SAMPLES)/eac3/csi_miami_stereo_128_spx_small.pcm
 
-FATE_TESTS += fate-eac3-3
+FATE_AC3 += fate-eac3-3
 fate-eac3-3: CMD = pcm -i $(SAMPLES)/eac3/matrix2_commentary1_stereo_192_small.eac3
 fate-eac3-3: CMP = oneoff
 fate-eac3-3: REF = $(SAMPLES)/eac3/matrix2_commentary1_stereo_192_small.pcm
 
-FATE_TESTS += fate-eac3-4
+FATE_AC3 += fate-eac3-4
 fate-eac3-4: CMD = pcm -i $(SAMPLES)/eac3/serenity_english_5.1_1536_small.eac3
 fate-eac3-4: CMP = oneoff
 fate-eac3-4: REF = $(SAMPLES)/eac3/serenity_english_5.1_1536_small.pcm
+
+FATE_TESTS += $(FATE_AC3)
+fate-ac3: $(FATE_AC3)
diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak
index 417273b7c5..202f0b2be0 100644
--- a/tests/fate/adpcm.mak
+++ b/tests/fate/adpcm.mak
@@ -1,41 +1,44 @@
-FATE_TESTS += fate-adpcm-ea-r2
+FATE_ADPCM += fate-adpcm-ea-r2
 fate-adpcm-ea-r2: CMD = crc -i $(SAMPLES)/ea-mpc/THX_logo.mpc -vn
 
-FATE_TESTS += fate-adpcm-ea-r3
+FATE_ADPCM += fate-adpcm-ea-r3
 fate-adpcm-ea-r3: CMD = crc -i $(SAMPLES)/ea-vp6/THX_logo.vp6 -vn
 
-FATE_TESTS += fate-adpcm-creative
+FATE_ADPCM += fate-adpcm-creative
 fate-adpcm-creative: CMD = md5 -i $(SAMPLES)/creative/intro-partial.wav -f s16le
 
-FATE_TESTS += fate-adpcm-creative-8-2bit
+FATE_ADPCM += fate-adpcm-creative-8-2bit
 fate-adpcm-creative-8-2bit: CMD = md5 -i $(SAMPLES)/creative/BBC_2BIT.VOC -f s16le
 
-FATE_TESTS += fate-adpcm-creative-8-2.6bit
+FATE_ADPCM += fate-adpcm-creative-8-2.6bit
 fate-adpcm-creative-8-2.6bit: CMD = md5 -i $(SAMPLES)/creative/BBC_3BIT.VOC -f s16le
 
-FATE_TESTS += fate-adpcm-creative-8-4bit
+FATE_ADPCM += fate-adpcm-creative-8-4bit
 fate-adpcm-creative-8-4bit: CMD = md5 -i $(SAMPLES)/creative/BBC_4BIT.VOC -f s16le
 
-FATE_TESTS += fate-adpcm-ea-mad-ea-r1
+FATE_ADPCM += fate-adpcm-ea-mad-ea-r1
 fate-adpcm-ea-mad-ea-r1: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad
 
-FATE_TESTS += fate-adpcm-ea-tqi
+FATE_ADPCM += fate-adpcm-ea-tqi
 fate-adpcm-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26
 
-FATE_TESTS += fate-adpcm-ima-dk3
+FATE_ADPCM += fate-adpcm-ima-dk3
 fate-adpcm-ima-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le
 
-FATE_TESTS += fate-adpcm-ima-dk4
+FATE_ADPCM += fate-adpcm-ima-dk4
 fate-adpcm-ima-dk4: CMD = md5 -i $(SAMPLES)/duck/salsa-audio-only.avi -f s16le
 
-FATE_TESTS += fate-adpcm-ima_wav-stereo
+FATE_ADPCM += fate-adpcm-ima_wav-stereo
 fate-adpcm-ima_wav-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le
 
-FATE_TESTS += fate-adpcm-psx-str-v3
+FATE_ADPCM += fate-adpcm-psx-str-v3
 fate-adpcm-psx-str-v3: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn
 
-FATE_TESTS += fate-adpcm-thp
+FATE_ADPCM += fate-adpcm-thp
 fate-adpcm-thp: CMD = framecrc -idct simple -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp
 
-FATE_TESTS += fate-adpcm_ms-stereo
+FATE_ADPCM += fate-adpcm_ms-stereo
 fate-adpcm_ms-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le
+
+FATE_TESTS += $(FATE_ADPCM)
+fate-adpcm: $(FATE_ADPCM)
diff --git a/tests/fate/amrnb.mak b/tests/fate/amrnb.mak
index e633fec65b..3545ba86fb 100644
--- a/tests/fate/amrnb.mak
+++ b/tests/fate/amrnb.mak
@@ -1,47 +1,50 @@
-FATE_TESTS += fate-amrnb-4k75
+FATE_AMRNB += fate-amrnb-4k75
 fate-amrnb-4k75: CMD = pcm -i $(SAMPLES)/amrnb/4.75k.amr
 fate-amrnb-4k75: CMP = stddev
 fate-amrnb-4k75: REF = $(SAMPLES)/amrnb/4.75k.pcm
 fate-amrnb-4k75: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-5k15
+FATE_AMRNB += fate-amrnb-5k15
 fate-amrnb-5k15: CMD = pcm -i $(SAMPLES)/amrnb/5.15k.amr
 fate-amrnb-5k15: CMP = stddev
 fate-amrnb-5k15: REF = $(SAMPLES)/amrnb/5.15k.pcm
 fate-amrnb-5k15: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-5k9
+FATE_AMRNB += fate-amrnb-5k9
 fate-amrnb-5k9: CMD = pcm -i $(SAMPLES)/amrnb/5.9k.amr
 fate-amrnb-5k9: CMP = stddev
 fate-amrnb-5k9: REF = $(SAMPLES)/amrnb/5.9k.pcm
 fate-amrnb-5k9: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-6k7
+FATE_AMRNB += fate-amrnb-6k7
 fate-amrnb-6k7: CMD = pcm -i $(SAMPLES)/amrnb/6.7k.amr
 fate-amrnb-6k7: CMP = stddev
 fate-amrnb-6k7: REF = $(SAMPLES)/amrnb/6.7k.pcm
 fate-amrnb-6k7: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-7k4
+FATE_AMRNB += fate-amrnb-7k4
 fate-amrnb-7k4: CMD = pcm -i $(SAMPLES)/amrnb/7.4k.amr
 fate-amrnb-7k4: CMP = stddev
 fate-amrnb-7k4: REF = $(SAMPLES)/amrnb/7.4k.pcm
 fate-amrnb-7k4: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-7k95
+FATE_AMRNB += fate-amrnb-7k95
 fate-amrnb-7k95: CMD = pcm -i $(SAMPLES)/amrnb/7.95k.amr
 fate-amrnb-7k95: CMP = stddev
 fate-amrnb-7k95: REF = $(SAMPLES)/amrnb/7.95k.pcm
 fate-amrnb-7k95: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-10k2
+FATE_AMRNB += fate-amrnb-10k2
 fate-amrnb-10k2: CMD = pcm -i $(SAMPLES)/amrnb/10.2k.amr
 fate-amrnb-10k2: CMP = stddev
 fate-amrnb-10k2: REF = $(SAMPLES)/amrnb/10.2k.pcm
 fate-amrnb-10k2: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-12k2
+FATE_AMRNB += fate-amrnb-12k2
 fate-amrnb-12k2: CMD = pcm -i $(SAMPLES)/amrnb/12.2k.amr
 fate-amrnb-12k2: CMP = stddev
 fate-amrnb-12k2: REF = $(SAMPLES)/amrnb/12.2k.pcm
 fate-amrnb-12k2: FUZZ = 1
+
+FATE_TESTS += $(FATE_AMRNB)
+fate-amrnb: $(FATE_AMRNB)
diff --git a/tests/fate/amrwb.mak b/tests/fate/amrwb.mak
index d3931c7ccb..8fc7928995 100644
--- a/tests/fate/amrwb.mak
+++ b/tests/fate/amrwb.mak
@@ -1,59 +1,62 @@
-FATE_TESTS += fate-amrwb-6k60
+FATE_AMRWB += fate-amrwb-6k60
 fate-amrwb-6k60: CMD = pcm -i $(SAMPLES)/amrwb/seed-6k60.awb
 fate-amrwb-6k60: CMP = stddev
 fate-amrwb-6k60: REF = $(SAMPLES)/amrwb/seed-6k60.pcm
 fate-amrwb-6k60: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-8k85
+FATE_AMRWB += fate-amrwb-8k85
 fate-amrwb-8k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-8k85.awb
 fate-amrwb-8k85: CMP = stddev
 fate-amrwb-8k85: REF = $(SAMPLES)/amrwb/seed-8k85.pcm
 fate-amrwb-8k85: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-12k65
+FATE_AMRWB += fate-amrwb-12k65
 fate-amrwb-12k65: CMD = pcm -i $(SAMPLES)/amrwb/seed-12k65.awb
 fate-amrwb-12k65: CMP = stddev
 fate-amrwb-12k65: REF = $(SAMPLES)/amrwb/seed-12k65.pcm
 fate-amrwb-12k65: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-14k25
+FATE_AMRWB += fate-amrwb-14k25
 fate-amrwb-14k25: CMD = pcm -i $(SAMPLES)/amrwb/seed-14k25.awb
 fate-amrwb-14k25: CMP = stddev
 fate-amrwb-14k25: REF = $(SAMPLES)/amrwb/seed-14k25.pcm
 fate-amrwb-14k25: FUZZ = 2.6
 
-FATE_TESTS += fate-amrwb-15k85
+FATE_AMRWB += fate-amrwb-15k85
 fate-amrwb-15k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-15k85.awb
 fate-amrwb-15k85: CMP = stddev
 fate-amrwb-15k85: REF = $(SAMPLES)/amrwb/seed-15k85.pcm
 fate-amrwb-15k85: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-18k25
+FATE_AMRWB += fate-amrwb-18k25
 fate-amrwb-18k25: CMD = pcm -i $(SAMPLES)/amrwb/seed-18k25.awb
 fate-amrwb-18k25: CMP = stddev
 fate-amrwb-18k25: REF = $(SAMPLES)/amrwb/seed-18k25.pcm
 fate-amrwb-18k25: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-19k85
+FATE_AMRWB += fate-amrwb-19k85
 fate-amrwb-19k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-19k85.awb
 fate-amrwb-19k85: CMP = stddev
 fate-amrwb-19k85: REF = $(SAMPLES)/amrwb/seed-19k85.pcm
 fate-amrwb-19k85: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-23k05
+FATE_AMRWB += fate-amrwb-23k05
 fate-amrwb-23k05: CMD = pcm -i $(SAMPLES)/amrwb/seed-23k05.awb
 fate-amrwb-23k05: CMP = stddev
 fate-amrwb-23k05: REF = $(SAMPLES)/amrwb/seed-23k05.pcm
 fate-amrwb-23k05: FUZZ = 2
 
-FATE_TESTS += fate-amrwb-23k85
+FATE_AMRWB += fate-amrwb-23k85
 fate-amrwb-23k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-23k85.awb
 fate-amrwb-23k85: CMP = stddev
 fate-amrwb-23k85: REF = $(SAMPLES)/amrwb/seed-23k85.pcm
 fate-amrwb-23k85: FUZZ = 2
 
-FATE_TESTS += fate-amrwb-23k85-2
+FATE_AMRWB += fate-amrwb-23k85-2
 fate-amrwb-23k85-2: CMD = pcm -i $(SAMPLES)/amrwb/deus-23k85.awb
 fate-amrwb-23k85-2: CMP = stddev
 fate-amrwb-23k85-2: REF = $(SAMPLES)/amrwb/deus-23k85.pcm
 fate-amrwb-23k85-2: FUZZ = 1
+
+FATE_TESTS += $(FATE_AMRWB)
+fate-amrwb: $(FATE_AMRWB)
diff --git a/tests/fate/atrac.mak b/tests/fate/atrac.mak
index 1d586c6e79..efb1727463 100644
--- a/tests/fate/atrac.mak
+++ b/tests/fate/atrac.mak
@@ -1,19 +1,22 @@
-FATE_TESTS += fate-atrac1
+FATE_ATRAC += fate-atrac1
 fate-atrac1: CMD = pcm -i $(SAMPLES)/atrac1/test_tones_small.aea
 fate-atrac1: CMP = oneoff
 fate-atrac1: REF = $(SAMPLES)/atrac1/test_tones_small.pcm
 
-FATE_TESTS += fate-atrac3-1
+FATE_ATRAC += fate-atrac3-1
 fate-atrac3-1: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_066_small.wav
 fate-atrac3-1: CMP = oneoff
 fate-atrac3-1: REF = $(SAMPLES)/atrac3/mc_sich_at3_066_small.pcm
 
-FATE_TESTS += fate-atrac3-2
+FATE_ATRAC += fate-atrac3-2
 fate-atrac3-2: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_105_small.wav
 fate-atrac3-2: CMP = oneoff
 fate-atrac3-2: REF = $(SAMPLES)/atrac3/mc_sich_at3_105_small.pcm
 
-FATE_TESTS += fate-atrac3-3
+FATE_ATRAC += fate-atrac3-3
 fate-atrac3-3: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_132_small.wav
 fate-atrac3-3: CMP = oneoff
 fate-atrac3-3: REF = $(SAMPLES)/atrac3/mc_sich_at3_132_small.pcm
+
+FATE_TESTS += $(FATE_ATRAC)
+fate-atrac: $(FATE_ATRAC)
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak
index 9c9a6ff1d2..fcaad147c9 100644
--- a/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@ -1,15 +1,18 @@
-FATE_TESTS += fate-binkaudio-dct
+FATE_BINKAUDIO += fate-binkaudio-dct
 fate-binkaudio-dct: CMD = pcm -i $(SAMPLES)/bink/binkaudio_dct.bik
 fate-binkaudio-dct: CMP = oneoff
 fate-binkaudio-dct: REF = $(SAMPLES)/bink/binkaudio_dct.pcm
 fate-binkaudio-dct: FUZZ = 2
 
-FATE_TESTS += fate-binkaudio-rdft
+FATE_BINKAUDIO += fate-binkaudio-rdft
 fate-binkaudio-rdft: CMD = pcm -i $(SAMPLES)/bink/binkaudio_rdft.bik
 fate-binkaudio-rdft: CMP = oneoff
 fate-binkaudio-rdft: REF = $(SAMPLES)/bink/binkaudio_rdft.pcm
 fate-binkaudio-rdft: FUZZ = 2
 
+FATE_TESTS += $(FATE_BINKAUDIO)
+fate-binkaudio: $(FATE_BINKAUDIO)
+
 FATE_TESTS += fate-dts
 fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts
 fate-dts: CMP = oneoff
diff --git a/tests/fate/dpcm.mak b/tests/fate/dpcm.mak
index 84c0a80214..a8b8b3d8ed 100644
--- a/tests/fate/dpcm.mak
+++ b/tests/fate/dpcm.mak
@@ -1,9 +1,11 @@
-FATE_TESTS += fate-dpcm-idroq
+FATE_DPCM += fate-dpcm-idroq
 fate-dpcm-idroq: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq
 
-FATE_TESTS += fate-dpcm-sierra
+FATE_DPCM += fate-dpcm-sierra
 fate-dpcm-sierra: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le
 
-FATE_TESTS += fate-dpcm-xan
+FATE_DPCM += fate-dpcm-xan
 fate-dpcm-xan: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le
 
+FATE_TESTS += $(FATE_DPCM)
+fate-dpcm: $(FATE_DPCM)
diff --git a/tests/fate/fft.mak b/tests/fate/fft.mak
index feb47afe00..3afbbe0116 100644
--- a/tests/fate/fft.mak
+++ b/tests/fate/fft.mak
@@ -37,3 +37,4 @@ $(FATE_FFT_FIXED): libavcodec/fft-fixed-test$(EXESUF)
 $(FATE_FFT_FIXED): REF = /dev/null
 
 FATE_TESTS += $(FATE_FFT) $(FATE_FFT_FIXED)
+fate-fft: $(FATE_FFT) $(FATE_FFT_FIXED)
diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 5291e68884..1d3dbc10e9 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -7,24 +7,27 @@ fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
 FATE_TESTS += fate-ptx
 fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
 
-FATE_TESTS += fate-sunraster-1bit-raw
+FATE_SUNRASTER += fate-sunraster-1bit-raw
 fate-sunraster-1bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-raw.sun
 
-FATE_TESTS += fate-sunraster-1bit-rle
+FATE_SUNRASTER += fate-sunraster-1bit-rle
 fate-sunraster-1bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-rle.sun
 
-FATE_TESTS += fate-sunraster-8bit-raw
+FATE_SUNRASTER += fate-sunraster-8bit-raw
 fate-sunraster-8bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24
 
-FATE_TESTS += fate-sunraster-8bit-rle
+FATE_SUNRASTER += fate-sunraster-8bit-rle
 fate-sunraster-8bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24
 
-FATE_TESTS += fate-sunraster-24bit-raw
+FATE_SUNRASTER += fate-sunraster-24bit-raw
 fate-sunraster-24bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-raw.sun
 
-FATE_TESTS += fate-sunraster-24bit-rle
+FATE_SUNRASTER += fate-sunraster-24bit-rle
 fate-sunraster-24bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-rle.sun
 
+FATE_TESTS += $(FATE_SUNRASTER)
+fate-sunraster: $(FATE_SUNRASTER)
+
 FATE_TARGA = CBW8       \
              CCM8       \
              CTC16      \
@@ -55,8 +58,11 @@ fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC
 
 fate-targa-top-to-bottom: CMD = framecrc -i $(SAMPLES)/targa/lena-top-to-bottom.tga
 
-FATE_TESTS += fate-tiff-fax-g3
+FATE_TIFF += fate-tiff-fax-g3
 fate-tiff-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF
 
-FATE_TESTS += fate-tiff-fax-g3s
+FATE_TIFF += fate-tiff-fax-g3s
 fate-tiff-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF
+
+FATE_TESTS += $(FATE_TIFF)
+fate-tiff: $(FATE_TIFF)
diff --git a/tests/fate/indeo.mak b/tests/fate/indeo.mak
index 36bf21bd8f..cf1625c114 100644
--- a/tests/fate/indeo.mak
+++ b/tests/fate/indeo.mak
@@ -1,11 +1,14 @@
-FATE_TESTS += fate-indeo2
+FATE_INDEO += fate-indeo2
 fate-indeo2: CMD = framecrc -i $(SAMPLES)/rt21/VPAR0026.AVI
 
-FATE_TESTS += fate-indeo3
+FATE_INDEO += fate-indeo3
 fate-indeo3: CMD = framecrc -i $(SAMPLES)/iv32/cubes.mov
 
-FATE_TESTS += fate-indeo4
+FATE_INDEO += fate-indeo4
 fate-indeo4: CMD = framecrc -i $(SAMPLES)/iv41/indeo41-partial.avi -an
 
-FATE_TESTS += fate-indeo5
+FATE_INDEO += fate-indeo5
 fate-indeo5: CMD = framecrc -i $(SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an
+
+FATE_TESTS += $(FATE_INDEO)
+fate-indeo: $(FATE_INDEO)
diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak
index 0c2b669b69..d87abc522a 100644
--- a/tests/fate/lossless-video.mak
+++ b/tests/fate/lossless-video.mak
@@ -1,9 +1,12 @@
-FATE_TESTS += fate-loco-rgb
+FATE_LOCO += fate-loco-rgb
 fate-loco-rgb: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-rgb.avi
 
-FATE_TESTS += fate-loco-yuy2
+FATE_LOCO += fate-loco-yuy2
 fate-loco-yuy2: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-0.avi
 
+FATE_TESTS += $(FATE_LOCO)
+fate-loco: $(FATE_LOCO)
+
 FATE_TESTS += fate-msrle-8bit
 fate-msrle-8bit: CMD = framecrc -i $(SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24
 
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
index 7fd784da48..5bc27b8855 100644
--- a/tests/fate/microsoft.mak
+++ b/tests/fate/microsoft.mak
@@ -1,30 +1,39 @@
 FATE_TESTS += fate-msmpeg4v1
 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an
 
-FATE_TESTS += fate-msvideo1-16bit
+FATE_MSVIDEO1 += fate-msvideo1-16bit
 fate-msvideo1-16bit: CMD = framecrc -i $(SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24
 
-FATE_TESTS += fate-msvideo1-8bit
+FATE_MSVIDEO1 += fate-msvideo1-8bit
 fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24
 
-FATE_TESTS += fate-wmv8-drm
+FATE_TESTS += $(FATE_MSVIDEO1)
+fate-msvideo1: $(FATE_MSVIDEO1)
+
+FATE_WMV8_DRM += fate-wmv8-drm
 # discard last packet to avoid fails due to overread of VC-1 decoder
 fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -an -vframes 162
 
-FATE_TESTS += fate-wmv8-drm-nodec
+FATE_WMV8_DRM += fate-wmv8-drm-nodec
 fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy
 
-FATE_TESTS += fate-vc1_sa00040
+FATE_TESTS += $(FATE_WMV8_DRM)
+fate-wmv8_drm: $(FATE_WMV8_DRM)
+
+FATE_VC1 += fate-vc1_sa00040
 fate-vc1_sa00040: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1
 
-FATE_TESTS += fate-vc1_sa00050
+FATE_VC1 += fate-vc1_sa00050
 fate-vc1_sa00050: CMD = framecrc -i $(SAMPLES)/vc1/SA00050.vc1
 
-FATE_TESTS += fate-vc1_sa10091
+FATE_VC1 += fate-vc1_sa10091
 fate-vc1_sa10091: CMD = framecrc -i $(SAMPLES)/vc1/SA10091.vc1
 
-FATE_TESTS += fate-vc1_sa20021
+FATE_VC1 += fate-vc1_sa20021
 fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1
 
-FATE_TESTS += fate-vc1-ism
+FATE_VC1 += fate-vc1-ism
 fate-vc1-ism: CMD = framecrc -i $(SAMPLES)/isom/vc1-wmapro.ism -an
+
+FATE_TESTS += $(FATE_VC1)
+fate-vc1: $(FATE_VC1)
diff --git a/tests/fate/mpc.mak b/tests/fate/mpc.mak
index a5f1b30a23..2b263ce6be 100644
--- a/tests/fate/mpc.mak
+++ b/tests/fate/mpc.mak
@@ -1,11 +1,14 @@
-FATE_TESTS += fate-mpc7-demux
+FATE_MPC += fate-mpc7-demux
 fate-mpc7-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp7.mpc -acodec copy
 
-FATE_TESTS += fate-mpc8-demux
+FATE_MPC += fate-mpc8-demux
 fate-mpc8-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp8.mpc -acodec copy
 
-FATE_TESTS += fate-musepack7
+FATE_MPC += fate-musepack7
 fate-musepack7: CMD = pcm -i $(SAMPLES)/musepack/inside-mp7.mpc
 fate-musepack7: CMP = oneoff
 fate-musepack7: REF = $(SAMPLES)/musepack/inside-mp7.pcm
 fate-musepack7: FUZZ = 1
+
+FATE_TESTS += $(FATE_MPC)
+fate-mpc: $(FATE_MPC)
diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak
index 068fb899cd..3ce04f9cea 100644
--- a/tests/fate/pcm.mak
+++ b/tests/fate/pcm.mak
@@ -1,26 +1,29 @@
-FATE_TESTS += fate-ea-mad-pcm-planar
+FATE_PCM += fate-ea-mad-pcm-planar
 fate-ea-mad-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad
 
-FATE_TESTS += fate-film-cvid-pcm-stereo-8bit
+FATE_PCM += fate-film-cvid-pcm-stereo-8bit
 fate-film-cvid-pcm-stereo-8bit: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk
 
-FATE_TESTS += fate-iff-pcm
+FATE_PCM += fate-iff-pcm
 fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le
 
-FATE_TESTS += fate-pcm_dvd
+FATE_PCM += fate-pcm_dvd
 fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
 
-FATE_TESTS += fate-pcm_s16be-stereo
+FATE_PCM += fate-pcm_s16be-stereo
 fate-pcm_s16be-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le
 
-FATE_TESTS += fate-pcm_s16le-stereo
+FATE_PCM += fate-pcm_s16le-stereo
 fate-pcm_s16le-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le
 
-FATE_TESTS += fate-pcm_u8-mono
+FATE_PCM += fate-pcm_u8-mono
 fate-pcm_u8-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le
 
-FATE_TESTS += fate-pcm_u8-stereo
+FATE_PCM += fate-pcm_u8-stereo
 fate-pcm_u8-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le
 
-FATE_TESTS += fate-w64
+FATE_PCM += fate-w64
 fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64
+
+FATE_TESTS += $(FATE_PCM)
+fate-pcm: $(FATE_PCM)
diff --git a/tests/fate/qtrle.mak b/tests/fate/qtrle.mak
index 1fd393b6ae..cd357b5b8f 100644
--- a/tests/fate/qtrle.mak
+++ b/tests/fate/qtrle.mak
@@ -1,20 +1,23 @@
-FATE_TESTS += fate-qtrle-1bit
+FATE_QTRLE += fate-qtrle-1bit
 fate-qtrle-1bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-Monochrome.mov
 
-FATE_TESTS += fate-qtrle-2bit
+FATE_QTRLE += fate-qtrle-2bit
 fate-qtrle-2bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-4Greys.mov -pix_fmt rgb24
 
-FATE_TESTS += fate-qtrle-4bit
+FATE_QTRLE += fate-qtrle-4bit
 fate-qtrle-4bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-16Greys.mov -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-qtrle-8bit
+FATE_QTRLE += fate-qtrle-8bit
 fate-qtrle-8bit: CMD = framecrc -i $(SAMPLES)/qtrle/criticalpath-credits.mov -vsync 0 -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-qtrle-16bit
+FATE_QTRLE += fate-qtrle-16bit
 fate-qtrle-16bit: CMD = framecrc -i $(SAMPLES)/qtrle/mr-cork-rle.mov -pix_fmt rgb24
 
-FATE_TESTS += fate-qtrle-24bit
+FATE_QTRLE += fate-qtrle-24bit
 fate-qtrle-24bit: CMD = framecrc -i $(SAMPLES)/qtrle/aletrek-rle.mov -vsync 0
 
-FATE_TESTS += fate-qtrle-32bit
+FATE_QTRLE += fate-qtrle-32bit
 fate-qtrle-32bit: CMD = framecrc -i $(SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt rgb24
+
+FATE_TESTS += $(FATE_QTRLE)
+fate-qtrle: $(FATE_QTRLE)
diff --git a/tests/fate/real.mak b/tests/fate/real.mak
index 4b88bbd08b..f0e4917b6a 100644
--- a/tests/fate/real.mak
+++ b/tests/fate/real.mak
@@ -18,22 +18,25 @@ fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLE
 FATE_TESTS += fate-real-rv40
 fate-real-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an -vsync 0
 
-FATE_TESTS += fate-sipr-5k0
+FATE_SIPR += fate-sipr-5k0
 fate-sipr-5k0: CMD = pcm -i $(SAMPLES)/sipr/sipr_5k0.rm
 fate-sipr-5k0: CMP = oneoff
 fate-sipr-5k0: REF = $(SAMPLES)/sipr/sipr_5k0.pcm
 
-FATE_TESTS += fate-sipr-6k5
+FATE_SIPR += fate-sipr-6k5
 fate-sipr-6k5: CMD = pcm -i $(SAMPLES)/sipr/sipr_6k5.rm
 fate-sipr-6k5: CMP = oneoff
 fate-sipr-6k5: REF = $(SAMPLES)/sipr/sipr_6k5.pcm
 
-FATE_TESTS += fate-sipr-8k5
+FATE_SIPR += fate-sipr-8k5
 fate-sipr-8k5: CMD = pcm -i $(SAMPLES)/sipr/sipr_8k5.rm
 fate-sipr-8k5: CMP = oneoff
 fate-sipr-8k5: REF = $(SAMPLES)/sipr/sipr_8k5.pcm
 
-FATE_TESTS += fate-sipr-16k
+FATE_SIPR += fate-sipr-16k
 fate-sipr-16k: CMD = pcm -i $(SAMPLES)/sipr/sipr_16k.rm
 fate-sipr-16k: CMP = oneoff
 fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm
+
+FATE_TESTS += $(FATE_SIPR)
+fate-sipr: $(FATE_SIPR)
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak
index 7df7f3e2c3..b6d053b5f5 100644
--- a/tests/fate/screen.mak
+++ b/tests/fate/screen.mak
@@ -4,44 +4,56 @@ fate-cscd: CMD = framecrc -i $(SAMPLES)/CSCD/sample_video.avi -an -vsync 0 -pix_
 FATE_TESTS += fate-dxtory
 fate-dxtory: CMD = framecrc -i $(SAMPLES)/dxtory/dxtory_mic.avi
 
-FATE_TESTS += fate-fraps-v0
+FATE_FRAPS += fate-fraps-v0
 fate-fraps-v0: CMD = framecrc -i $(SAMPLES)/fraps/Griffin_Ragdoll01-partial.avi
 
-FATE_TESTS += fate-fraps-v1
+FATE_FRAPS += fate-fraps-v1
 fate-fraps-v1: CMD = framecrc -i $(SAMPLES)/fraps/sample-v1.avi -an
 
-FATE_TESTS += fate-fraps-v2
+FATE_FRAPS += fate-fraps-v2
 fate-fraps-v2: CMD = framecrc -i $(SAMPLES)/fraps/test3-nosound-partial.avi
 
-FATE_TESTS += fate-fraps-v3
+FATE_FRAPS += fate-fraps-v3
 fate-fraps-v3: CMD = framecrc -i $(SAMPLES)/fraps/psclient-partial.avi -pix_fmt rgb24
 
-FATE_TESTS += fate-fraps-v4
+FATE_FRAPS += fate-fraps-v4
 fate-fraps-v4: CMD = framecrc -i $(SAMPLES)/fraps/WoW_2006-11-03_14-58-17-19-nosound-partial.avi
 
-FATE_TESTS += fate-fraps-v5
+FATE_FRAPS += fate-fraps-v5
 fate-fraps-v5: CMD = framecrc -i $(SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi
 
-FATE_TESTS += fate-tscc-15bit
+FATE_TESTS += $(FATE_FRAPS)
+fate-fraps: $(FATE_FRAPS)
+
+FATE_TSCC += fate-tscc-15bit
 fate-tscc-15bit: CMD = framecrc -i $(SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt rgb24
 
-FATE_TESTS += fate-tscc-32bit
+FATE_TSCC += fate-tscc-32bit
 fate-tscc-32bit: CMD = framecrc -i $(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-vmnc-16bit
+FATE_TESTS += $(FATE_TSCC)
+fate-tscc: $(FATE_TSCC)
+
+FATE_VMNC += fate-vmnc-16bit
 fate-vmnc-16bit: CMD = framecrc -i $(SAMPLES)/VMnc/test.avi -pix_fmt rgb24
 
-FATE_TESTS += fate-vmnc-32bit
+FATE_VMNC += fate-vmnc-32bit
 fate-vmnc-32bit: CMD = framecrc -i $(SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24
 
-FATE_TESTS += fate-zmbv-8bit
+FATE_TESTS += $(FATE_VMNC)
+fate-vmnc: $(FATE_VMNC)
+
+FATE_ZMBV += fate-zmbv-8bit
 fate-zmbv-8bit: CMD = framecrc -i $(SAMPLES)/zmbv/wc2_001-partial.avi -an -pix_fmt rgb24
 
-FATE_TESTS += fate-zmbv-15bit
+FATE_ZMBV += fate-zmbv-15bit
 fate-zmbv-15bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_15bit.avi -pix_fmt rgb24 -t 25
 
-FATE_TESTS += fate-zmbv-16bit
+FATE_ZMBV += fate-zmbv-16bit
 fate-zmbv-16bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb24 -t 25
 
-FATE_TESTS += fate-zmbv-32bit
+FATE_ZMBV += fate-zmbv-32bit
 fate-zmbv-32bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25
+
+FATE_TESTS += $(FATE_ZMBV)
+fate-zmbv: $(FATE_ZMBV)
diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak
index 6ff0025686..7cf6237b1e 100644
--- a/tests/fate/utvideo.mak
+++ b/tests/fate/utvideo.mak
@@ -1,23 +1,26 @@
-FATE_TESTS += fate-utvideo_rgba_left
+FATE_UTVIDEO += fate-utvideo_rgba_left
 fate-utvideo_rgba_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_left.avi
 
-FATE_TESTS += fate-utvideo_rgba_median
+FATE_UTVIDEO += fate-utvideo_rgba_median
 fate-utvideo_rgba_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_median.avi
 
-FATE_TESTS += fate-utvideo_rgb_left
+FATE_UTVIDEO += fate-utvideo_rgb_left
 fate-utvideo_rgb_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_left.avi
 
-FATE_TESTS += fate-utvideo_rgb_median
+FATE_UTVIDEO += fate-utvideo_rgb_median
 fate-utvideo_rgb_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_median.avi
 
-FATE_TESTS += fate-utvideo_yuv420_left
+FATE_UTVIDEO += fate-utvideo_yuv420_left
 fate-utvideo_yuv420_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv420_left.avi
 
-FATE_TESTS += fate-utvideo_yuv420_median
+FATE_UTVIDEO += fate-utvideo_yuv420_median
 fate-utvideo_yuv420_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv420_median.avi
 
-FATE_TESTS += fate-utvideo_yuv422_left
+FATE_UTVIDEO += fate-utvideo_yuv422_left
 fate-utvideo_yuv422_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_left.avi
 
-FATE_TESTS += fate-utvideo_yuv422_median
+FATE_UTVIDEO += fate-utvideo_yuv422_median
 fate-utvideo_yuv422_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_median.avi
+
+FATE_TESTS += $(FATE_UTVIDEO)
+fate-utvideo: $(FATE_UTVIDEO)
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index 439c76175e..c90661eb64 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -1,9 +1,12 @@
-FATE_TESTS += fate-4xm-1
+FATE_4XM += fate-4xm-1
 fate-4xm-1: CMD = framecrc -i $(SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-4xm-2
+FATE_4XM += fate-4xm-2
 fate-4xm-2: CMD = framecrc -i $(SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an
 
+FATE_TESTS += $(FATE_4XM)
+fate-4xm: $(FATE_4XM)
+
 FATE_TESTS += fate-aasc
 fate-aasc: CMD = framecrc -i $(SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24
 
@@ -46,15 +49,18 @@ fate-corepng: CMD = framecrc -i $(SAMPLES)/png1/corepng-partial.avi
 FATE_TESTS += fate-creatureshock-avs
 fate-creatureshock-avs: CMD = framecrc -i $(SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24
 
-FATE_TESTS += fate-cvid-partial
+FATE_CVID += fate-cvid-partial
 fate-cvid-partial: CMD = framecrc -i $(SAMPLES)/cvid/laracroft-cinepak-partial.avi -an
 
-FATE_TESTS += fate-cvid-palette
+FATE_CVID += fate-cvid-palette
 fate-cvid-palette: CMD = framecrc -i $(SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-cvid-grayscale
+FATE_CVID += fate-cvid-grayscale
 fate-cvid-grayscale: CMD = framecrc -i $(SAMPLES)/cvid/pcitva15.avi -an
 
+FATE_TESTS += $(FATE_CVID)
+fate-cvid: $(FATE_CVID)
+
 FATE_TESTS += fate-cyberia-c93
 fate-cyberia-c93: CMD = framecrc -i $(SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24
 
@@ -67,30 +73,39 @@ fate-delphine-cin: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -p
 FATE_TESTS += fate-deluxepaint-anm
 fate-deluxepaint-anm: CMD = framecrc -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24
 
-FATE_TESTS += fate-truemotion1-15
+FATE_TRUEMOTION1 += fate-truemotion1-15
 fate-truemotion1-15: CMD = framecrc -i $(SAMPLES)/duck/phant2-940.duk -pix_fmt rgb24
 
-FATE_TESTS += fate-truemotion1-24
+FATE_TRUEMOTION1 += fate-truemotion1-24
 fate-truemotion1-24: CMD = framecrc -i $(SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24
 
+FATE_TESTS += $(FATE_TRUEMOTION1)
+fate-truemotion1: $(FATE_TRUEMOTION1)
+
 FATE_TESTS += fate-truemotion2
 fate-truemotion2: CMD = framecrc -i $(SAMPLES)/duck/tm20.avi
 
-FATE_TESTS += fate-dxa-feeble
+FATE_DXA += fate-dxa-feeble
 fate-dxa-feeble: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24
 
-FATE_TESTS += fate-dxa-scummvm
+FATE_DXA += fate-dxa-scummvm
 fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24
 
-FATE_TESTS += fate-flic-af11-palette-change
+FATE_TESTS += $(FATE_DXA)
+fate-dxa: $(FATE_DXA)
+
+FATE_FLIC += fate-flic-af11-palette-change
 fate-flic-af11-palette-change: CMD = framecrc -i $(SAMPLES)/fli/fli-engines.fli -t 3.3 -pix_fmt rgb24
 
-FATE_TESTS += fate-flic-af12
+FATE_FLIC += fate-flic-af12
 fate-flic-af12: CMD = framecrc -i $(SAMPLES)/fli/jj00c2.fli -pix_fmt rgb24
 
-FATE_TESTS += fate-flic-magiccarpet
+FATE_FLIC += fate-flic-magiccarpet
 fate-flic-magiccarpet: CMD = framecrc -i $(SAMPLES)/fli/intel.dat -pix_fmt rgb24
 
+FATE_TESTS += $(FATE_FLIC)
+fate-flic: $(FATE_FLIC)
+
 FATE_TESTS += fate-frwu
 fate-frwu: CMD = framecrc -i $(SAMPLES)/frwu/frwu.avi
 
@@ -100,15 +115,18 @@ fate-id-cin-video: CMD = framecrc -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb
 FATE_TESTS-$(CONFIG_AVFILTER) += fate-idroq-video-encode
 fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f RoQ -t 0.2
 
-FATE_TESTS += fate-iff-byterun1
+FATE_IFF += fate-iff-byterun1
 fate-iff-byterun1: CMD = framecrc -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24
 
-FATE_TESTS += fate-iff-fibonacci
+FATE_IFF += fate-iff-fibonacci
 fate-iff-fibonacci: CMD = md5 -i $(SAMPLES)/iff/dasboot-in-compressed -f s16le
 
-FATE_TESTS += fate-iff-ilbm
+FATE_IFF += fate-iff-ilbm
 fate-iff-ilbm: CMD = framecrc -i $(SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24
 
+FATE_TESTS += $(FATE_IFF)
+fate-iff: $(FATE_IFF)
+
 FATE_TESTS += fate-kmvc
 fate-kmvc: CMD = framecrc -i $(SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24
 
@@ -154,12 +172,15 @@ fate-tiertex-seq: CMD = framecrc -i $(SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt
 FATE_TESTS += fate-tmv
 fate-tmv: CMD = framecrc -i $(SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24
 
-FATE_TESTS += fate-txd-16bpp
+FATE_TXD += fate-txd-16bpp
 fate-txd-16bpp: CMD = framecrc -i $(SAMPLES)/txd/misc.txd -pix_fmt bgra -an
 
-FATE_TESTS += fate-txd-pal8
+FATE_TXD += fate-txd-pal8
 fate-txd-pal8: CMD = framecrc -i $(SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an
 
+FATE_TESTS += $(FATE_TXD)
+fate-txd: $(FATE_TXD)
+
 FATE_TESTS += fate-ulti
 fate-ulti: CMD = framecrc -i $(SAMPLES)/ulti/hit12w.avi -an
 
diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak
index 583c6059ba..834b0ffc1f 100644
--- a/tests/fate/voice.mak
+++ b/tests/fate/voice.mak
@@ -5,12 +5,15 @@ FATE_TESTS += fate-g722enc
 fate-g722enc: tests/data/asynth-16000-1.sw
 fate-g722enc: CMD = md5 -ar 16000 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/asynth-16000-1.sw -acodec g722 -ac 1 -f g722
 
-FATE_TESTS += fate-gsm-ms
+FATE_GSM += fate-gsm-ms
 fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav
 
-FATE_TESTS += fate-gsm-toast
+FATE_GSM += fate-gsm-toast
 fate-gsm-toast: CMD = framecrc -i $(SAMPLES)/gsm/sample-gsm-8000.mov -t 10
 
+FATE_TESTS += $(FATE_GSM)
+fate-gsm: $(FATE_GSM)
+
 FATE_TESTS += fate-qcelp
 fate-qcelp: CMD = pcm -i $(SAMPLES)/qcp/0036580847.QCP
 fate-qcelp: CMP = oneoff
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index df6c4ab5fe..f55771e773 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -4,12 +4,15 @@ fate-ea-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6
 FATE_TESTS += fate-ea-vp61
 fate-ea-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
 
-FATE_TESTS += fate-vp31
+FATE_VP3 += fate-vp31
 fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
 
-FATE_TESTS += fate-vp3-coeff-level64
+FATE_VP3 += fate-vp3-coeff-level64
 fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv
 
+FATE_TESTS += $(FATE_VP3)
+fate-vp3: $(FATE_VP3)
+
 FATE_TESTS += fate-vp5
 fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an
 
diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak
index e448d76472..3d849ea146 100644
--- a/tests/fate/wma.mak
+++ b/tests/fate/wma.mak
@@ -1,32 +1,38 @@
-FATE_TESTS += fate-wmapro-2ch
+FATE_WMAPRO += fate-wmapro-2ch
 fate-wmapro-2ch: CMD = pcm -i $(SAMPLES)/wmapro/Beethovens_9th-1_small.wma
 fate-wmapro-2ch: CMP = oneoff
 fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small.pcm
 
-FATE_TESTS += fate-wmapro-5.1
+FATE_WMAPRO += fate-wmapro-5.1
 fate-wmapro-5.1: CMD = pcm -i $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma
 fate-wmapro-5.1: CMP = oneoff
 fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.pcm
 
-FATE_TESTS += fate-wmapro-ism
+FATE_WMAPRO += fate-wmapro-ism
 fate-wmapro-ism: CMD = pcm -i $(SAMPLES)/isom/vc1-wmapro.ism -vn
 fate-wmapro-ism: CMP = oneoff
 fate-wmapro-ism: REF = $(SAMPLES)/isom/vc1-wmapro.pcm
 
-FATE_TESTS += fate-wmavoice-7k
+FATE_TESTS += $(FATE_WMAPRO)
+fate-wmapro: $(FATE_WMAPRO)
+
+FATE_WMAVOICE += fate-wmavoice-7k
 fate-wmavoice-7k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-7K.wma
 fate-wmavoice-7k: CMP = stddev
 fate-wmavoice-7k: REF = $(SAMPLES)/wmavoice/streaming_CBR-7K.pcm
 fate-wmavoice-7k: FUZZ = 3
 
-FATE_TESTS += fate-wmavoice-11k
+FATE_WMAVOICE += fate-wmavoice-11k
 fate-wmavoice-11k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-11K.wma
 fate-wmavoice-11k: CMP = stddev
 fate-wmavoice-11k: REF = $(SAMPLES)/wmavoice/streaming_CBR-11K.pcm
 fate-wmavoice-11k: FUZZ = 3
 
-FATE_TESTS += fate-wmavoice-19k
+FATE_WMAVOICE += fate-wmavoice-19k
 fate-wmavoice-19k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-19K.wma
 fate-wmavoice-19k: CMP = stddev
 fate-wmavoice-19k: REF = $(SAMPLES)/wmavoice/streaming_CBR-19K.pcm
 fate-wmavoice-19k: FUZZ = 3
+
+FATE_TESTS += $(FATE_WMAVOICE)
+fate-wmavoice: $(FATE_WMAVOICE)