diff --git a/tests/fate/jpeg2000.mak b/tests/fate/jpeg2000.mak
index b72908f710..2969d2cf0a 100644
--- a/tests/fate/jpeg2000.mak
+++ b/tests/fate/jpeg2000.mak
@@ -33,10 +33,10 @@ fate-jpeg2000dec-p0_04: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpe
 FATE_JPEG2000DEC += fate-jpeg2000dec-p0_05
 fate-jpeg2000dec-p0_05: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile0/p0_05.j2k
 
-FATE_JPEG2000DEC += fate-jpeg2000dec-p0_07
+FATE_JPEG2000DEC-$(CONFIG_SCALE_FILTER) += fate-jpeg2000dec-p0_07
 fate-jpeg2000dec-p0_07: CMD = framecrc -flags +bitexact -auto_conversion_filters -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile0/p0_07.j2k -pix_fmt rgb48le
 
-FATE_JPEG2000DEC += fate-jpeg2000dec-p0_08
+FATE_JPEG2000DEC-$(CONFIG_SCALE_FILTER) += fate-jpeg2000dec-p0_08
 fate-jpeg2000dec-p0_08: CMD = framecrc -flags +bitexact -auto_conversion_filters -lowres 1 -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile0/p0_08.j2k -pix_fmt rgb48le
 
 FATE_JPEG2000DEC += fate-jpeg2000dec-p0_09
@@ -60,5 +60,7 @@ fate-jpeg2000dec-p0_16: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpe
 FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_01_b11
 fate-jpeg2000dec-ds0_ht_01_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/ds0_ht_01_b11.j2k
 
-FATE_SAMPLES_FFMPEG += $(FATE_JPEG2000DEC)
+FATE_JPEG2000DEC += $(FATE_JPEG2000DEC-yes)
+
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, IMAGE_J2K_PIPE, JPEG2000) += $(FATE_JPEG2000DEC)
 fate-jpeg2000dec: $(FATE_JPEG2000DEC)