diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index e173c4a4b8..b36554f3b1 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -164,8 +164,14 @@ FATE_SAMPLES_AVCONV += fate-mpeg2-field-enc
 fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an
 
 # FIXME dropped frames in this test because of coarse timebase
-FATE_SAMPLES_AVCONV += fate-nuv
-fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an
+FATE_NUV += fate-nuv-rtjpeg
+fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an
+
+FATE_NUV += fate-nuv-rtjpeg-fh
+fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/rtjpeg_frameheader.nuv -an
+
+FATE_SAMPLES_AVCONV += $(FATE_NUV)
+fate-nuv: $(FATE_NUV)
 
 FATE_SAMPLES_AVCONV += fate-qpeg
 fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24
diff --git a/tests/ref/fate/nuv b/tests/ref/fate/nuv-rtjpeg
similarity index 100%
rename from tests/ref/fate/nuv
rename to tests/ref/fate/nuv-rtjpeg
diff --git a/tests/ref/fate/nuv-rtjpeg-fh b/tests/ref/fate/nuv-rtjpeg-fh
new file mode 100644
index 0000000000..92aa122ac3
--- /dev/null
+++ b/tests/ref/fate/nuv-rtjpeg-fh
@@ -0,0 +1,51 @@
+#tb 0: 1/1000
+0,          0,          0,        0,   221184, 0xf48c94f6
+0,         40,         40,        0,   221184, 0x89b625b2
+0,         60,         60,        0,   221184, 0x37e04714
+0,         80,         80,        0,   221184, 0x4f4c5224
+0,        100,        100,        0,   221184, 0x9193c9f1
+0,        120,        120,        0,   221184, 0x5d1a6197
+0,        140,        140,        0,   221184, 0x40cd51e7
+0,        160,        160,        0,   221184, 0xb2c1a729
+0,        200,        200,        0,   221184, 0x998d6144
+0,        220,        220,        0,   221184, 0xf5d52311
+0,        240,        240,        0,   221184, 0xea9dd6bf
+0,        260,        260,        0,   221184, 0x0e2ed854
+0,        280,        280,        0,   221184, 0xe295ba58
+0,        300,        300,        0,   221184, 0x8aedbb69
+0,        320,        320,        0,   221184, 0x253c9aaa
+0,        340,        340,        0,   221184, 0x5eaf9fb1
+0,        360,        360,        0,   221184, 0xcdb5a0cb
+0,        380,        380,        0,   221184, 0xcdb5a0cb
+0,        400,        400,        0,   221184, 0x23f89994
+0,        420,        420,        0,   221184, 0x23f89994
+0,        440,        440,        0,   221184, 0x10dc98d6
+0,        460,        460,        0,   221184, 0x799b9d98
+0,        480,        480,        0,   221184, 0xb226996c
+0,        500,        500,        0,   221184, 0x0ac59a42
+0,        520,        520,        0,   221184, 0x87c2a654
+0,        540,        540,        0,   221184, 0xf4c1a711
+0,        560,        560,        0,   221184, 0xf60fa72e
+0,        580,        580,        0,   221184, 0xc8f8b6fc
+0,        600,        600,        0,   221184, 0xd709b813
+0,        620,        620,        0,   221184, 0x5fdfb76b
+0,        640,        640,        0,   221184, 0x5798b0aa
+0,        660,        660,        0,   221184, 0xf572b1c3
+0,        680,        680,        0,   221184, 0x14b0afdf
+0,        700,        700,        0,   221184, 0x0a66b5b8
+0,        720,        720,        0,   221184, 0xe316c620
+0,        740,        740,        0,   221184, 0xbc76c5c2
+0,        760,        760,        0,   221184, 0x77c7c5e5
+0,        780,        780,        0,   221184, 0xfc7ac63e
+0,        800,        800,        0,   221184, 0x05a29ffe
+0,        820,        820,        0,   221184, 0x9bffbf6c
+0,        840,        840,        0,   221184, 0x3c55be40
+0,        860,        860,        0,   221184, 0x6f46c14e
+0,        880,        880,        0,   221184, 0x9cf4ae70
+0,        900,        900,        0,   221184, 0xf205b2f8
+0,        920,        920,        0,   221184, 0x7180aff8
+0,        940,        940,        0,   221184, 0x125eaffe
+0,        960,        960,        0,   221184, 0x6970a32d
+0,        980,        980,        0,   221184, 0xaea79f62
+0,       1000,       1000,        0,   221184, 0x48d2a093
+0,       1020,       1020,        0,   221184, 0x10a59eb5