diff --git a/Makefile b/Makefile
index 4752649d6f..029948d526 100644
--- a/Makefile
+++ b/Makefile
@@ -276,14 +276,18 @@ tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS)
 	$(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
 include $(SRC_PATH_BARE)/tests/fate.mak
+include $(SRC_PATH_BARE)/tests/fate2.mak
+
+FATE_TESTS += $(FATE2_TESTS)
 
 ifdef SAMPLES
 fate: $(FATE_TESTS)
+fate2: $(FATE2_TESTS)
 $(FATE_TESTS): ffmpeg$(EXESUF) tests/tiny_psnr$(HOSTEXESUF)
 	@echo "TEST FATE   $(@:fate-%=%)"
 	@$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)'
 else
-fate $(FATE_TESTS):
+fate fate2 $(FATE_TESTS):
 	@echo "SAMPLES not specified, cannot run FATE"
 endif
 
diff --git a/tests/fate2.mak b/tests/fate2.mak
new file mode 100644
index 0000000000..c4fc5aad42
--- /dev/null
+++ b/tests/fate2.mak
@@ -0,0 +1,4 @@
+FATE2_TESTS += fate-twinvq
+fate-twinvq: CMD = $(TARGET_PATH)/ffmpeg -i $(SAMPLES)/vqf/achterba.vqf -f s16le -
+fate-twinvq: CMP = oneoff
+fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm