diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak
index 824e6c86ab..ad9c85863b 100644
--- a/tests/fate/cbs.mak
+++ b/tests/fate/cbs.mak
@@ -34,10 +34,10 @@ FATE_CBS_AV1_SAMPLES =              \
     seq_hdr_op_param_info.ivf       \
     switch_frame.ivf
 
-$(foreach N,$(FATE_CBS_AV1_CONFORMANCE_SAMPLES),$(eval $(call FATE_CBS_TEST,av1,$(basename $(N)),av1-test-vectors/$(N),ivf)))
-$(foreach N,$(FATE_CBS_AV1_SAMPLES),$(eval $(call FATE_CBS_TEST,av1,$(basename $(N)),av1/$(N),ivf)))
+$(foreach N,$(FATE_CBS_AV1_CONFORMANCE_SAMPLES),$(eval $(call FATE_CBS_TEST,av1,$(basename $(N)),av1-test-vectors/$(N),rawvideo)))
+$(foreach N,$(FATE_CBS_AV1_SAMPLES),$(eval $(call FATE_CBS_TEST,av1,$(basename $(N)),av1/$(N),rawvideo)))
 
-FATE_CBS_AV1-$(call ALLYES, IVF_DEMUXER AV1_PARSER AV1_METADATA_BSF IVF_MUXER) = $(FATE_CBS_av1)
+FATE_CBS_AV1-$(call ALLYES, IVF_DEMUXER AV1_PARSER AV1_METADATA_BSF RAWVIDEO_MUXER) = $(FATE_CBS_av1)
 FATE_SAMPLES_AVCONV += $(FATE_CBS_AV1-yes)
 fate-cbs-av1: $(FATE_CBS_AV1-yes)
 
diff --git a/tests/ref/fate/cbs-av1-av1-1-b10-23-film_grain-50 b/tests/ref/fate/cbs-av1-av1-1-b10-23-film_grain-50
index d1a5512daf..500e655803 100644
--- a/tests/ref/fate/cbs-av1-av1-1-b10-23-film_grain-50
+++ b/tests/ref/fate/cbs-av1-av1-1-b10-23-film_grain-50
@@ -1 +1 @@
-aaddbf87bdf9b5ac4b1ab4fe802c410b
+0ab934a437181d0275dc6c26bb9f6281
diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-02-allintra b/tests/ref/fate/cbs-av1-av1-1-b8-02-allintra
index 9a127ff90c..11abf2f336 100644
--- a/tests/ref/fate/cbs-av1-av1-1-b8-02-allintra
+++ b/tests/ref/fate/cbs-av1-av1-1-b8-02-allintra
@@ -1 +1 @@
-b905c6f2bf68fddbf58a50f940c5f5a2
+134b447b04086088de4da127a97731f3
diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-03-sizedown b/tests/ref/fate/cbs-av1-av1-1-b8-03-sizedown
index 6d771a2331..7188d16dad 100644
--- a/tests/ref/fate/cbs-av1-av1-1-b8-03-sizedown
+++ b/tests/ref/fate/cbs-av1-av1-1-b8-03-sizedown
@@ -1 +1 @@
-4db2f13b7028a2bb6a5a067badf1b0ad
+e5924930773efdbbd82da02c96747f27
diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-03-sizeup b/tests/ref/fate/cbs-av1-av1-1-b8-03-sizeup
index 689934c2fb..9d767bbede 100644
--- a/tests/ref/fate/cbs-av1-av1-1-b8-03-sizeup
+++ b/tests/ref/fate/cbs-av1-av1-1-b8-03-sizeup
@@ -1 +1 @@
-964ea060d898a4358708b3f83ecda4b5
+0348fba6ebf6caadfe80b19a6ad93caa
diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-04-cdfupdate b/tests/ref/fate/cbs-av1-av1-1-b8-04-cdfupdate
index f0a2481f8a..9325deac36 100644
--- a/tests/ref/fate/cbs-av1-av1-1-b8-04-cdfupdate
+++ b/tests/ref/fate/cbs-av1-av1-1-b8-04-cdfupdate
@@ -1 +1 @@
-e24ce6a099ce9389f06606b0a7653007
+aec87cd950fb985b1e345d0366709aea
diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-05-mv b/tests/ref/fate/cbs-av1-av1-1-b8-05-mv
index b3350a283b..aa4ab5138b 100644
--- a/tests/ref/fate/cbs-av1-av1-1-b8-05-mv
+++ b/tests/ref/fate/cbs-av1-av1-1-b8-05-mv
@@ -1 +1 @@
-b39c0edaf5695367ec07eeffce57303d
+33f548eeef87e12b93b9bf4a3b79c70e
diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-06-mfmv b/tests/ref/fate/cbs-av1-av1-1-b8-06-mfmv
index 929a2a4498..ede34aede0 100644
--- a/tests/ref/fate/cbs-av1-av1-1-b8-06-mfmv
+++ b/tests/ref/fate/cbs-av1-av1-1-b8-06-mfmv
@@ -1 +1 @@
-95c1fcf60b4fc4530d38f0896c783e28
+2e20870d44ba5ec5a8e1450b287e20b4
diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L1T2 b/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L1T2
index 1c3cc5cebd..d17f202fdc 100644
--- a/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L1T2
+++ b/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L1T2
@@ -1 +1 @@
-16f91c11586a53336ee8b2e57a6503c9
+f7138eaa1e572260a8a34f73f91e058a
diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L2T1 b/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L2T1
index 09368ac3fd..a23f3cbd4e 100644
--- a/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L2T1
+++ b/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L2T1
@@ -1 +1 @@
-e7a413248005a06a98443c9ef645f92b
+4f51af7abcf75eba35ab1c4796793681
diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L2T2 b/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L2T2
index c2faf1b5ce..7b6a77d980 100644
--- a/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L2T2
+++ b/tests/ref/fate/cbs-av1-av1-1-b8-22-svc-L2T2
@@ -1 +1 @@
-75e1296365303b39e642ff1a933cac4f
+d52adb1719a0422782e40352e44c6cb0
diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-23-film_grain-50 b/tests/ref/fate/cbs-av1-av1-1-b8-23-film_grain-50
index 0e54b44cb6..c0daa8d1cb 100644
--- a/tests/ref/fate/cbs-av1-av1-1-b8-23-film_grain-50
+++ b/tests/ref/fate/cbs-av1-av1-1-b8-23-film_grain-50
@@ -1 +1 @@
-2556d6d30469c647c6262130d8eb0531
+99a635753d7e4e7deb99fd2ba866818e
diff --git a/tests/ref/fate/cbs-av1-decode_model b/tests/ref/fate/cbs-av1-decode_model
index cca6426090..3d7695804f 100644
--- a/tests/ref/fate/cbs-av1-decode_model
+++ b/tests/ref/fate/cbs-av1-decode_model
@@ -1 +1 @@
-228a6ee5204a4d6fb00c22080e8153bc
+171ebf527c4cd57179d6a4e5c4f23ce4
diff --git a/tests/ref/fate/cbs-av1-frames_refs_short_signaling b/tests/ref/fate/cbs-av1-frames_refs_short_signaling
index eee02e5122..15a76aef88 100644
--- a/tests/ref/fate/cbs-av1-frames_refs_short_signaling
+++ b/tests/ref/fate/cbs-av1-frames_refs_short_signaling
@@ -1 +1 @@
-ebe808041a023ba46249cc676a89bb51
+d1b05cf934aeda64b25a93423904c14d
diff --git a/tests/ref/fate/cbs-av1-non_uniform_tiling b/tests/ref/fate/cbs-av1-non_uniform_tiling
index 0d0ebc2cbd..257ae07d61 100644
--- a/tests/ref/fate/cbs-av1-non_uniform_tiling
+++ b/tests/ref/fate/cbs-av1-non_uniform_tiling
@@ -1 +1 @@
-e82617e3d4e694a5598447606c0fcda7
+3e204ee8a71273cf0247f48e977e64b7
diff --git a/tests/ref/fate/cbs-av1-seq_hdr_op_param_info b/tests/ref/fate/cbs-av1-seq_hdr_op_param_info
index 75da9c5f9a..85d4f9b071 100644
--- a/tests/ref/fate/cbs-av1-seq_hdr_op_param_info
+++ b/tests/ref/fate/cbs-av1-seq_hdr_op_param_info
@@ -1 +1 @@
-d3aa6616d22c983ae0ad04100cd00698
+10e7bdd7cab67f203520e44b28a6477c
diff --git a/tests/ref/fate/cbs-av1-switch_frame b/tests/ref/fate/cbs-av1-switch_frame
index ff9ccc72b6..07b0fd6b36 100644
--- a/tests/ref/fate/cbs-av1-switch_frame
+++ b/tests/ref/fate/cbs-av1-switch_frame
@@ -1 +1 @@
-72889950e593695af54575e414470314
+156b5297ca32c18183ca41a102a09a02