diff --git a/tests/Makefile b/tests/Makefile
index 108ee7fef801d944882eba96a042768f6894992d..229a5764ac22ef600c4eb51bdf60ce037218abb9 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -51,6 +51,7 @@ include $(SRC_PATH)/tests/fate/screen.mak
 include $(SRC_PATH)/tests/fate/utvideo.mak
 include $(SRC_PATH)/tests/fate/vorbis.mak
 include $(SRC_PATH)/tests/fate/vpx.mak
+include $(SRC_PATH)/tests/fate/vqf.mak
 include $(SRC_PATH)/tests/fate/wma.mak
 
 FATE_ACODEC  = $(ACODEC_TESTS:%=fate-acodec-%)
diff --git a/tests/fate.mak b/tests/fate.mak
index 3bf598f21b866b3a79af73b127008792ace95f9f..a2c007cfcf9fe310c54736ce8ef88243eaeb2d5a 100644
--- a/tests/fate.mak
+++ b/tests/fate.mak
@@ -238,8 +238,6 @@ FATE_TESTS += fate-video-xl
 fate-video-xl: CMD = framecrc  -i $(SAMPLES)/vixl/pig-vixl.avi
 FATE_TESTS += fate-vqa-cc
 fate-vqa-cc: CMD = framecrc  -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24
-FATE_TESTS += fate-vqf-demux
-fate-vqf-demux: CMD = md5  -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc
 FATE_TESTS += fate-w64
 fate-w64: CMD = crc  -i $(SAMPLES)/w64/w64-pcm16.w64
 FATE_TESTS += fate-wc3movie-xan
diff --git a/tests/fate/vqf.mak b/tests/fate/vqf.mak
new file mode 100644
index 0000000000000000000000000000000000000000..6860fadbb2e7919483428eb352e4356d488f9ff9
--- /dev/null
+++ b/tests/fate/vqf.mak
@@ -0,0 +1,7 @@
+FATE_TESTS += fate-twinvq
+fate-twinvq: CMD = pcm -i $(SAMPLES)/vqf/achterba.vqf
+fate-twinvq: CMP = oneoff
+fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm
+
+FATE_TESTS += fate-vqf-demux
+fate-vqf-demux: CMD = md5  -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc
diff --git a/tests/fate2.mak b/tests/fate2.mak
index 6f17e27c2480c59c1995830fed82a7971caa481e..e925278d9b255888faebc6d09e0105a2e0740dd3 100644
--- a/tests/fate2.mak
+++ b/tests/fate2.mak
@@ -1,8 +1,3 @@
-FATE_TESTS += fate-twinvq
-fate-twinvq: CMD = pcm -i $(SAMPLES)/vqf/achterba.vqf
-fate-twinvq: CMP = oneoff
-fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm
-
 FATE_TESTS += fate-mpeg2-field-enc
 fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an