diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak
index af078aa7de700ceb3299734224b3013e68ab5930..3bfe78a995f360d43a812eb7a77688b4b7c9e906 100644
--- a/tests/fate/avfilter.mak
+++ b/tests/fate/avfilter.mak
@@ -1,10 +1,6 @@
 #FIXME the whole file should be removed
 
-FATE_LAVFI = fate-lavfi-field                                           \
-             fate-lavfi-il                                              \
-
 FATE_LAVFI-$(CONFIG_GPL) += fate-lavfi-kerndeint                        \
-                            fate-lavfi-pixfmts_super2xsai               \
                             fate-lavfi-tinterlace_merge                 \
                             fate-lavfi-tinterlace_pad                   \
 
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 82843ac808fe315fb4a24d12df5ec1153db5c617..2067d67abbb0a1aac83b2f7fee4bc84f252b0606 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -180,9 +180,18 @@ fate-filter-pixfmts-copy:  CMD = pixfmts
 FATE_FILTER_PIXFMTS += fate-filter-pixfmts-crop
 fate-filter-pixfmts-crop:  CMD = pixfmts "100:100:100:100"
 
+FATE_FILTER_PIXFMTS += fate-filter-pixfmts-field
+fate-filter-pixfmts-field: CMD = pixfmts "bottom"
+
 FATE_FILTER_PIXFMTS += fate-filter-pixfmts-hflip
 fate-filter-pixfmts-hflip: CMD = pixfmts
 
+#FATE_FILTER_PIXFMTS += fate-filter-pixfmts-histeq
+#fate-filter-pixfmts-histeq: CMD = pixfmts "antibanding=strong"
+
+FATE_FILTER_PIXFMTS += fate-filter-pixfmts-il
+fate-filter-pixfmts-il:    CMD = pixfmts "luma_mode=d:chroma_mode=d:alpha_mode=d"
+
 FATE_FILTER_PIXFMTS += fate-filter-pixfmts-null
 fate-filter-pixfmts-null:  CMD = pixfmts
 
@@ -192,6 +201,9 @@ fate-filter-pixfmts-pad:   CMD = pixfmts "500:400:20:20"
 FATE_FILTER_PIXFMTS += fate-filter-pixfmts-scale
 fate-filter-pixfmts-scale: CMD = pixfmts "200:100"
 
+FATE_FILTER_PIXFMTS += fate-filter-pixfmts-super2xsai
+fate-filter-pixfmts-super2xsai: CMD = pixfmts
+
 FATE_FILTER_PIXFMTS += fate-filter-pixfmts-vflip
 fate-filter-pixfmts-vflip: CMD = pixfmts
 
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
index b455b8147410f297f844c607de8899e7fedf4374..506d1dc1dcd39323668df4a84b255805d43a5d4a 100755
--- a/tests/lavfi-regression.sh
+++ b/tests/lavfi-regression.sh
@@ -51,11 +51,7 @@ do_lavfi_pixfmts(){
 }
 
 # all these filters have exactly one input and exactly one output
-do_lavfi_pixfmts "field"               "field"   "bottom"
-do_lavfi_pixfmts "histeq"              "histeq"  "antibanding=strong"
-do_lavfi_pixfmts "il"                  "il"      "luma_mode=d:chroma_mode=d:alpha_mode=d"
 do_lavfi_pixfmts "kerndeint"           "kerndeint" "" "tinterlace=interleave_top,"
-do_lavfi_pixfmts "pixfmts_super2xsai"  "super2xsai"
 do_lavfi_pixfmts "tinterlace_merge"    "tinterlace" "merge"
 do_lavfi_pixfmts "tinterlace_pad"      "tinterlace" "pad"
 
diff --git a/tests/ref/lavfi/field b/tests/ref/fate/filter-pixfmts-field
similarity index 100%
rename from tests/ref/lavfi/field
rename to tests/ref/fate/filter-pixfmts-field
diff --git a/tests/ref/lavfi/histeq b/tests/ref/fate/filter-pixfmts-histeq
similarity index 100%
rename from tests/ref/lavfi/histeq
rename to tests/ref/fate/filter-pixfmts-histeq
diff --git a/tests/ref/lavfi/il b/tests/ref/fate/filter-pixfmts-il
similarity index 100%
rename from tests/ref/lavfi/il
rename to tests/ref/fate/filter-pixfmts-il
diff --git a/tests/ref/lavfi/pixfmts_super2xsai b/tests/ref/fate/filter-pixfmts-super2xsai
similarity index 100%
rename from tests/ref/lavfi/pixfmts_super2xsai
rename to tests/ref/fate/filter-pixfmts-super2xsai