diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak
index ec4012ebb6d7734a98415733669fe5dc9202b9ec..61b8507a01818aa6687ee2449bab70843e61e800 100644
--- a/tests/fate/libavcodec.mak
+++ b/tests/fate/libavcodec.mak
@@ -1,8 +1,11 @@
-FATE_TESTS += fate-golomb
+FATE_LIBAVCODEC += fate-golomb
 fate-golomb: libavcodec/golomb-test$(EXESUF)
 fate-golomb: CMD = run libavcodec/golomb-test
 fate-golomb: REF = /dev/null
 
-FATE_TESTS += fate-iirfilter
+FATE_LIBAVCODEC += fate-iirfilter
 fate-iirfilter: libavcodec/iirfilter-test$(EXESUF)
 fate-iirfilter: CMD = run libavcodec/iirfilter-test
+
+FATE_TESTS += $(FATE_LIBAVCODEC)
+fate-libavcodec: $(FATE_LIBAVCODEC)
diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak
index a65b7243053790e2c989a5f92bafc758cc4f70e5..ad03137b735858b043a3dc9531cbd3b38d79c429 100644
--- a/tests/fate/libavutil.mak
+++ b/tests/fate/libavutil.mak
@@ -1,38 +1,41 @@
-FATE_TESTS += fate-adler32
+FATE_LIBAVUTIL += fate-adler32
 fate-adler32: libavutil/adler32-test$(EXESUF)
 fate-adler32: CMD = run libavutil/adler32-test
 fate-adler32: REF = /dev/null
 
-FATE_TESTS += fate-aes
+FATE_LIBAVUTIL += fate-aes
 fate-aes: libavutil/aes-test$(EXESUF)
 fate-aes: CMD = run libavutil/aes-test
 fate-aes: REF = /dev/null
 
-FATE_TESTS += fate-base64
+FATE_LIBAVUTIL += fate-base64
 fate-base64: libavutil/base64-test$(EXESUF)
 fate-base64: CMD = run libavutil/base64-test
 
-FATE_TESTS += fate-crc
+FATE_LIBAVUTIL += fate-crc
 fate-crc: libavutil/crc-test$(EXESUF)
 fate-crc: CMD = run libavutil/crc-test
 
-FATE_TESTS += fate-des
+FATE_LIBAVUTIL += fate-des
 fate-des: libavutil/des-test$(EXESUF)
 fate-des: CMD = run libavutil/des-test
 fate-des: REF = /dev/null
 
-FATE_TESTS += fate-eval
+FATE_LIBAVUTIL += fate-eval
 fate-eval: libavutil/eval-test$(EXESUF)
 fate-eval: CMD = run libavutil/eval-test
 
-FATE_TESTS += fate-fifo
+FATE_LIBAVUTIL += fate-fifo
 fate-fifo: libavutil/fifo-test$(EXESUF)
 fate-fifo: CMD = run libavutil/fifo-test
 
-FATE_TESTS += fate-md5
+FATE_LIBAVUTIL += fate-md5
 fate-md5: libavutil/md5-test$(EXESUF)
 fate-md5: CMD = run libavutil/md5-test
 
-FATE_TESTS += fate-sha
+FATE_LIBAVUTIL += fate-sha
 fate-sha: libavutil/sha-test$(EXESUF)
 fate-sha: CMD = run libavutil/sha-test
+
+FATE_TESTS += $(FATE_LIBAVUTIL)
+fate-libavutil: $(FATE_LIBAVUTIL)
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index d7b2f22dd3febb8aea31feba898c13f526ac49e1..02680d415137a0a5483faaaa0351934b174ea81b 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -1,9 +1,12 @@
-FATE_TESTS += fate-ea-vp60
+FATE_EA_VP6 += fate-ea-vp60
 fate-ea-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6
 
-FATE_TESTS += fate-ea-vp61
+FATE_EA_VP6 += fate-ea-vp61
 fate-ea-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
 
+FATE_TESTS += $(FATE_EA_VP6)
+fate-ea-vp6: $(FATE_EA_VP6)
+
 FATE_VP3 += fate-vp31
 fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi