diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index 29ef25ce90c52b6c58fd6a214162fc7eb02b2fdc..bbce95dd87c67f0addf34079da25bff8f96fbead 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -190,6 +190,10 @@ FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-interlace-crop
 # by using a previous ref frame instead of a missing one
 FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-invalid-ref-mod
 
+# this sample gives an explicit size for a single NAL unit, but contains
+# several NAL units
+FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-mixed-nal-coding
+
 # this sample has invalid extradata that is not escaped
 FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-unescaped-extradata
 
@@ -380,6 +384,7 @@ fate-h264-extreme-plane-pred:                     CMD = framemd5 -i $(TARGET_SAM
 fate-h264-interlace-crop:                         CMD = framecrc -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -vframes 3
 fate-h264-invalid-ref-mod:                        CMD = framecrc -i $(TARGET_SAMPLES)/h264/h264refframeregression.mp4 -an -frames 10 -pix_fmt yuv420p10le
 fate-h264-lossless:                               CMD = framecrc -i $(TARGET_SAMPLES)/h264/lossless.h264
+fate-h264-mixed-nal-coding:                       CMD = framecrc -i $(TARGET_SAMPLES)/h264/mixed-nal-coding.mp4
 fate-h264-unescaped-extradata:                    CMD = framecrc -i $(TARGET_SAMPLES)/h264/unescaped_extradata.mp4 -an -frames 10
 
 fate-h264-reinit-%:                               CMD = framecrc -i $(TARGET_SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10le,scale=w=352:h=288
diff --git a/tests/ref/fate/h264-mixed-nal-coding b/tests/ref/fate/h264-mixed-nal-coding
new file mode 100644
index 0000000000000000000000000000000000000000..6bebce6b6a2c5049bf299c3fa0d2455163aa35bb
--- /dev/null
+++ b/tests/ref/fate/h264-mixed-nal-coding
@@ -0,0 +1,6 @@
+#tb 0: 1/30000
+0,          0,          0,        0,   518400, 0x8f882e4d
+0,       1001,       1001,        0,   518400, 0xc5694144
+0,       2002,       2002,        0,   518400, 0xcf0e9e3a
+0,       3003,       3003,        0,   518400, 0xf620e459
+0,       4004,       4004,        0,   518400, 0x4566453e