diff --git a/Makefile b/Makefile
index 5d11938758..373aa8fed0 100644
--- a/Makefile
+++ b/Makefile
@@ -180,7 +180,9 @@ CODEC_TESTS = $(addprefix regtest-,             \
         snowll                                  \
         dv                                      \
         dv50                                    \
-        dnxhd                                   \
+        dnxhd_1080i                             \
+        dnxhd_720p                              \
+        dnxhd_720p_rd                           \
         svq1                                    \
         flashsv                                 \
         mp2                                     \
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index e8ddc300a2..3212ac0f3a 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -370,14 +370,18 @@ do_video_encoding dv50.dv "-dct int" "-s pal -pix_fmt yuv422p -an -sws_flags nei
 do_video_decoding "" "-s cif -pix_fmt yuv420p -sws_flags neighbor+bitexact"
 fi
 
-if [ -n "$do_dnxhd" ] ; then
+if [ -n "$do_dnxhd_1080i" ] ; then
 # FIXME: interlaced raw DNxHD decoding is broken
 do_video_encoding dnxhd-1080i.mov "" "-vcodec dnxhd -flags +ildct -s hd1080 -b 120Mb -pix_fmt yuv422p -an"
 do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p"
+fi
 
+if [ -n "$do_dnxhd_720p" ] ; then
 do_video_encoding dnxhd-720p.dnxhd "" "-s hd720 -b 90Mb -pix_fmt yuv422p -an"
 do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p"
+fi
 
+if [ -n "$do_dnxhd_720p_rd" ] ; then
 do_video_encoding dnxhd-720p-rd.dnxhd "" "-mbd rd -s hd720 -b 90Mb -pix_fmt yuv422p -an"
 do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p"
 fi
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 3c34d6b339..5545bc6699 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -164,15 +164,15 @@ af3f2dd5ab62c1a1d98b07d4aeb6852f *./tests/data/dv50.rotozoom.out.yuv
 stddev:    0.82 PSNR: 49.81 bytes:  7603200/  7603200
 981a11fcd1f5419facc016a7608b3df9 *./tests/data/a-dnxhd-1080i.mov
 30311415 ./tests/data/a-dnxhd-1080i.mov
-a0119aa04a86c80d6dfd0776c9ece580 *./tests/data/dnxhd.rotozoom.out.yuv
+a0119aa04a86c80d6dfd0776c9ece580 *./tests/data/dnxhd_1080i.rotozoom.out.yuv
 stddev:    1.53 PSNR: 44.37 bytes:  7603200/  7603200
 1ab8a3f04bde27c33e92fe110892e2cd *./tests/data/a-dnxhd-720p.dnxhd
 22937600 ./tests/data/a-dnxhd-720p.dnxhd
-7d546dc6d2bc87551614c0f730c59e1f *./tests/data/dnxhd.rotozoom.out.yuv
+7d546dc6d2bc87551614c0f730c59e1f *./tests/data/dnxhd_720p.rotozoom.out.yuv
 stddev:    2.10 PSNR: 41.64 bytes:  7603200/  7603200
 bf8621a44fb65452aded9cbdece81aa2 *./tests/data/a-dnxhd-720p-rd.dnxhd
 22937600 ./tests/data/a-dnxhd-720p-rd.dnxhd
-e556f5fe58df25b5b07930148a23a553 *./tests/data/dnxhd.rotozoom.out.yuv
+e556f5fe58df25b5b07930148a23a553 *./tests/data/dnxhd_720p_rd.rotozoom.out.yuv
 stddev:    1.54 PSNR: 44.33 bytes:  7603200/  7603200
 7f9fbe4890bc1df67867bf03803dca48 *./tests/data/a-svq1.mov
 766851 ./tests/data/a-svq1.mov
diff --git a/tests/vsynth.regression.ref b/tests/vsynth.regression.ref
index 3258254689..6ecc00fb63 100644
--- a/tests/vsynth.regression.ref
+++ b/tests/vsynth.regression.ref
@@ -164,15 +164,15 @@ a2ff093e93ffed10f730fa21df02fc50 *./tests/data/dv50.vsynth.out.yuv
 stddev:    1.72 PSNR: 43.37 bytes:  7603200/  7603200
 8ff3c18dabe28509b4e5b3fdaa7f0856 *./tests/data/a-dnxhd-1080i.mov
 30311415 ./tests/data/a-dnxhd-1080i.mov
-52f50a8031eebf980a1303e4744a49f8 *./tests/data/dnxhd.vsynth.out.yuv
+52f50a8031eebf980a1303e4744a49f8 *./tests/data/dnxhd_1080i.vsynth.out.yuv
 stddev:    6.28 PSNR: 32.16 bytes:  7603200/  7603200
 d206daba40f3c1be8b834de8a41e984c *./tests/data/a-dnxhd-720p.dnxhd
 22937600 ./tests/data/a-dnxhd-720p.dnxhd
-d7f14ee0dd3a4df95f05999677da348b *./tests/data/dnxhd.vsynth.out.yuv
+d7f14ee0dd3a4df95f05999677da348b *./tests/data/dnxhd_720p.vsynth.out.yuv
 stddev:    6.39 PSNR: 32.00 bytes:  7603200/  7603200
 c0a42b916489d3c1d0a315974821e28d *./tests/data/a-dnxhd-720p-rd.dnxhd
 22937600 ./tests/data/a-dnxhd-720p-rd.dnxhd
-50efe763b272af3367985218aff68b1b *./tests/data/dnxhd.vsynth.out.yuv
+50efe763b272af3367985218aff68b1b *./tests/data/dnxhd_720p_rd.vsynth.out.yuv
 stddev:    6.25 PSNR: 32.20 bytes:  7603200/  7603200
 595fc4e38734521356b60e67b813f0fa *./tests/data/a-svq1.mov
 1334367 ./tests/data/a-svq1.mov