diff --git a/tests/Makefile b/tests/Makefile
index f1472f3547..c5cd3a7706 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -81,6 +81,7 @@ include $(SRC_PATH)/tests/fate/demux.mak
 include $(SRC_PATH)/tests/fate/dfa.mak
 include $(SRC_PATH)/tests/fate/dpcm.mak
 include $(SRC_PATH)/tests/fate/ea.mak
+include $(SRC_PATH)/tests/fate/ffmpeg.mak
 include $(SRC_PATH)/tests/fate/ffprobe.mak
 include $(SRC_PATH)/tests/fate/filter.mak
 include $(SRC_PATH)/tests/fate/flac.mak
@@ -91,13 +92,11 @@ include $(SRC_PATH)/tests/fate/indeo.mak
 include $(SRC_PATH)/tests/fate/libavcodec.mak
 include $(SRC_PATH)/tests/fate/libavformat.mak
 include $(SRC_PATH)/tests/fate/libavutil.mak
-include $(SRC_PATH)/tests/fate/mapchan.mak
 include $(SRC_PATH)/tests/fate/lossless-audio.mak
 include $(SRC_PATH)/tests/fate/lossless-video.mak
 include $(SRC_PATH)/tests/fate/microsoft.mak
 include $(SRC_PATH)/tests/fate/mp3.mak
 include $(SRC_PATH)/tests/fate/mpc.mak
-include $(SRC_PATH)/tests/fate/options.mak
 include $(SRC_PATH)/tests/fate/pcm.mak
 include $(SRC_PATH)/tests/fate/probe.mak
 include $(SRC_PATH)/tests/fate/prores.mak
diff --git a/tests/fate/mapchan.mak b/tests/fate/ffmpeg.mak
similarity index 74%
rename from tests/fate/mapchan.mak
rename to tests/fate/ffmpeg.mak
index d8b3ba0e97..eb8666f9ea 100644
--- a/tests/fate/mapchan.mak
+++ b/tests/fate/ffmpeg.mak
@@ -12,3 +12,10 @@ fate-mapchan-silent-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-1.
 
 FATE_FFMPEG += $(FATE_MAPCHAN)
 fate-mapchan: $(FATE_MAPCHAN)
+
+FATE_FFMPEG += fate-force_key_frames
+fate-force_key_frames: tests/data/vsynth2.yuv
+fate-force_key_frames: CMD = enc_dec \
+  "rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth2.yuv \
+  avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \
+  framecrc "" "" "-skip_frame nokey"
diff --git a/tests/fate/options.mak b/tests/fate/options.mak
deleted file mode 100644
index 940d454ddf..0000000000
--- a/tests/fate/options.mak
+++ /dev/null
@@ -1,9 +0,0 @@
-FATE_OPTIONS += fate-options-force_key_frames
-fate-options-force_key_frames: tests/data/vsynth2.yuv
-fate-options-force_key_frames: CMD = enc_dec \
-  "rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth2.yuv \
-  avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \
-  framecrc "" "" "-skip_frame nokey"
-
-FATE_FFMPEG += $(FATE_OPTIONS)
-fate-options: $(FATE_OPTIONS)
diff --git a/tests/ref/fate/force_key_frames b/tests/ref/fate/force_key_frames
new file mode 100644
index 0000000000..b93adcaf16
--- /dev/null
+++ b/tests/ref/fate/force_key_frames
@@ -0,0 +1,4 @@
+5423335cd809e631a2e03f97585348e0 *tests/data/fate/force_key_frames.avi
+113308 tests/data/fate/force_key_frames.avi
+8f68ad2e602ecd87a3e0c097ba99d773 *tests/data/fate/force_key_frames.out.framecrc
+stddev:34363.01 PSNR:  5.61 MAXDIFF:56305 bytes:  7603200/      186
diff --git a/tests/ref/fate/options-force_key_frames b/tests/ref/fate/options-force_key_frames
deleted file mode 100644
index 1288624562..0000000000
--- a/tests/ref/fate/options-force_key_frames
+++ /dev/null
@@ -1,4 +0,0 @@
-5423335cd809e631a2e03f97585348e0 *tests/data/fate/options-force_key_frames.avi
-113308 tests/data/fate/options-force_key_frames.avi
-8f68ad2e602ecd87a3e0c097ba99d773 *tests/data/fate/options-force_key_frames.out.framecrc
-stddev:34363.01 PSNR:  5.61 MAXDIFF:56305 bytes:  7603200/      186