diff --git a/tests/Makefile b/tests/Makefile
index 93eb54801b..b7fb7403d5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -92,9 +92,6 @@ include $(SRC_PATH)/tests/fate/wma.mak
 FATE_AVCONV += $(FATE_AVCONV-yes)
 FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV)
 
-FATE-$(CONFIG_AVCODEC)  += $(FATE_LIBAVCODEC)
-FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT)
-
 FATE_SAMPLES_AVCONV           += $(FATE_SAMPLES_AVCONV-yes)
 FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV)
 FATE_SAMPLES += $(FATE_SAMPLES-yes)
diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak
index 765a1b8489..e7831bb083 100644
--- a/tests/fate/libavcodec.mak
+++ b/tests/fate/libavcodec.mak
@@ -13,4 +13,5 @@ fate-rangecoder: CMD = run libavcodec/rangecoder-test
 fate-rangecoder: CMP = null
 fate-rangecoder: REF = /dev/null
 
+FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC)
 fate-libavcodec: $(FATE_LIBAVCODEC)
diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak
index 9e5a9f05b0..b6eda42a63 100644
--- a/tests/fate/libavformat.mak
+++ b/tests/fate/libavformat.mak
@@ -2,4 +2,5 @@ FATE_LIBAVFORMAT += fate-url
 fate-url: libavformat/url-test$(EXESUF)
 fate-url: CMD = run libavformat/url-test
 
+FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT)
 fate-libavformat: $(FATE_LIBAVFORMAT)