diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index 3665b12057..f152e38351 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -161,6 +161,11 @@ do_video_encoding mjpeg.avi "-qscale 9 -an -vcodec mjpeg -pix_fmt yuvj420p"
 do_video_decoding "" "-pix_fmt yuv420p"
 fi
 
+if [ -n "$do_jpeg2000" ] ; then
+do_video_encoding jpeg2000.avi "-qscale 7 -an -vcodec j2k -strict experimental -pix_fmt rgb24"
+do_video_decoding "-vcodec j2k -strict experimental" "-pix_fmt yuv420p"
+fi
+
 if [ -n "$do_ljpeg" ] ; then
 do_video_encoding ljpeg.avi "-an -vcodec ljpeg -strict -1"
 do_video_decoding
diff --git a/tests/ref/vsynth1/jpeg2000 b/tests/ref/vsynth1/jpeg2000
new file mode 100644
index 0000000000..fa60ac2be6
--- /dev/null
+++ b/tests/ref/vsynth1/jpeg2000
@@ -0,0 +1,4 @@
+8da8ef50cccb9996f4bebbc585c4edb4 *./tests/data/vsynth1/jpeg2000.avi
+2306914 ./tests/data/vsynth1/jpeg2000.avi
+ee9b245b3b07eed90bc6f2147bbd916c *./tests/data/jpeg2000.vsynth1.out.yuv
+stddev:    5.47 PSNR: 33.37 MAXDIFF:   64 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth2/jpeg2000 b/tests/ref/vsynth2/jpeg2000
new file mode 100644
index 0000000000..4fc70ede5b
--- /dev/null
+++ b/tests/ref/vsynth2/jpeg2000
@@ -0,0 +1,4 @@
+b30dc1851c0fb37726d977ec1d5ad527 *./tests/data/vsynth2/jpeg2000.avi
+1151156 ./tests/data/vsynth2/jpeg2000.avi
+ec5218eec33a021945c28c72093382a5 *./tests/data/jpeg2000.vsynth2.out.yuv
+stddev:    4.54 PSNR: 34.99 MAXDIFF:   61 bytes:  7603200/  7603200