diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index 24e0c9c5cc..635abcd7b9 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -185,6 +185,10 @@ FATE_H264  := $(FATE_H264:%=fate-h264-conformance-%)                    \
 
 FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264)
 FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-crop-to-container
+
+# this sample has two stsd entries and needs to reload extradata
+FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-extradata-reload
+
 FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-interlace-crop
 
 # this sample has invalid reference list modification, but decodes fine
@@ -384,6 +388,7 @@ fate-h264-conformance-sva_nl2_e:                  CMD = framecrc -i $(TARGET_SAM
 fate-h264-bsf-mp4toannexb:                        CMD = md5 -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -vcodec copy -bsf h264_mp4toannexb -f h264
 fate-h264-crop-to-container:                      CMD = framemd5 -i $(TARGET_SAMPLES)/h264/crop-to-container-dims-canon.mov
 fate-h264-direct-bff:                             CMD = framecrc -i $(TARGET_SAMPLES)/h264/direct-bff.mkv
+fate-h264-extradata-reload:                       CMD = framemd5 -i $(TARGET_SAMPLES)/h264/extradata-reload-multi-stsd.mov
 fate-h264-extreme-plane-pred:                     CMD = framemd5 -i $(TARGET_SAMPLES)/h264/extreme-plane-pred.h264
 fate-h264-interlace-crop:                         CMD = framecrc -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -frames:v 3
 fate-h264-intra-refresh-recovery:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264/intra_refresh.h264 -frames:v 10
diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index fc4ce23bb7..5446969a7d 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -160,6 +160,11 @@ FATE_HEVC += fate-hevc-paramchange-yuv420p-yuv420p10
 
 FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += $(FATE_HEVC)
 
+# this sample has two stsd entries and needs to reload extradata
+FATE_HEVC-$(call DEMDEC, MOV, HEVC) += fate-hevc-extradata-reload
+
+fate-hevc-extradata-reload: CMD = framemd5 -i $(TARGET_SAMPLES)/hevc/extradata-reload-multi-stsd.mov
+
 FATE_SAMPLES_AVCONV += $(FATE_HEVC-yes)
 
 fate-hevc: $(FATE_HEVC-yes)
diff --git a/tests/ref/fate/h264-extradata-reload b/tests/ref/fate/h264-extradata-reload
new file mode 100644
index 0000000000..53e47aa296
--- /dev/null
+++ b/tests/ref/fate/h264-extradata-reload
@@ -0,0 +1,5 @@
+#tb 0: 1/25
+0,          0,          0,        1,    49152, ae09c88e87e3ea0aa8ad267ee91222e5
+0,          1,          1,        1,    49152, 7ccd8321a6e23ae1f82bd323c8376524
+0,          2,          2,        1,    49152, 8ed93ab585ff9848801cc28b75b5e12d
+0,          3,          3,        1,    49152, 0049913870ddb62ffc535282018766f4
diff --git a/tests/ref/fate/hevc-extradata-reload b/tests/ref/fate/hevc-extradata-reload
new file mode 100644
index 0000000000..9fcab7150d
--- /dev/null
+++ b/tests/ref/fate/hevc-extradata-reload
@@ -0,0 +1,5 @@
+#tb 0: 1/25
+0,          0,          0,        1,    24576, 0d01217c5d1ec6799643fc7d75ba2337
+0,          1,          1,        1,    24576, f73d9cca9b4c1765d0ead242c3f0c339
+0,          2,          2,        1,    24576, 39a8714d763c623ae7f6faae34e107d1
+0,          3,          3,        1,    24576, 5db2600aa268b4fd28b64ab28a096f32