diff --git a/tests/Makefile b/tests/Makefile
index eef90d70a5..c3e5ea91ae 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -143,6 +143,7 @@ include $(SRC_PATH)/tests/fate/libavutil.mak
 include $(SRC_PATH)/tests/fate/libswresample.mak
 include $(SRC_PATH)/tests/fate/lossless-audio.mak
 include $(SRC_PATH)/tests/fate/lossless-video.mak
+include $(SRC_PATH)/tests/fate/matroska.mak
 include $(SRC_PATH)/tests/fate/microsoft.mak
 include $(SRC_PATH)/tests/fate/monkeysaudio.mak
 include $(SRC_PATH)/tests/fate/mp3.mak
diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
new file mode 100644
index 0000000000..8cf1734803
--- /dev/null
+++ b/tests/fate/matroska.mak
@@ -0,0 +1,9 @@
+# This tests that the matroska demuxer supports modifying the colorspace
+# properties in remuxing (-c:v copy)
+# It also tests automatic insertion of the vp9_superframe bitstream filter
+FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux
+fate-matroska-remux: CMD = md5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska
+fate-matroska-remux: CMP = oneline
+fate-matroska-remux: REF = 5ebcfaa8e3d534f8a800a58fd2b0aca6
+
+FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes)