diff --git a/tests/Makefile b/tests/Makefile
index 019203c644..895944db9c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -109,6 +109,7 @@ include $(SRC_PATH)/tests/fate/als.mak
 include $(SRC_PATH)/tests/fate/amrnb.mak
 include $(SRC_PATH)/tests/fate/amrwb.mak
 include $(SRC_PATH)/tests/fate/api.mak
+include $(SRC_PATH)/tests/fate/apng.mak
 include $(SRC_PATH)/tests/fate/atrac.mak
 include $(SRC_PATH)/tests/fate/audio.mak
 include $(SRC_PATH)/tests/fate/bmp.mak
diff --git a/tests/fate/apng.mak b/tests/fate/apng.mak
new file mode 100644
index 0000000000..696c503806
--- /dev/null
+++ b/tests/fate/apng.mak
@@ -0,0 +1,10 @@
+FATE_APNG += fate-apng-clock
+fate-apng-clock: CMD = framecrc -i $(TARGET_SAMPLES)/apng/clock.png
+
+FATE_APNG += fate-apng-osample
+fate-apng-osample: CMD = framecrc -i $(TARGET_SAMPLES)/apng/o_sample.png
+
+FATE_APNG-$(call DEMDEC, APNG, PNG) += $(FATE_APNG)
+
+FATE_SAMPLES_FFMPEG += $(FATE_APNG)
+fate-apng: $(FATE_APNG-yes)
diff --git a/tests/ref/fate/apng-clock b/tests/ref/fate/apng-clock
new file mode 100644
index 0000000000..54db0944b7
--- /dev/null
+++ b/tests/ref/fate/apng-clock
@@ -0,0 +1,45 @@
+#tb 0: 6667/100000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 150x150
+#sar 0: 0/1
+0,          0,          0,        1,    23524, 0xf09caaa1
+0,          1,          1,        1,    23524, 0x1a329f21
+0,          2,          2,        1,    23524, 0x9b0ca017
+0,          3,          3,        1,    23524, 0x73b09deb
+0,          4,          4,        1,    23524, 0x23039f49
+0,          5,          5,        1,    23524, 0x58869e7b
+0,          6,          6,        1,    23524, 0xc26397d2
+0,          7,          7,        1,    23524, 0xe07f7d87
+0,          8,          8,        1,    23524, 0x619a82ba
+0,          9,          9,        1,    23524, 0x696c9757
+0,         10,         10,        1,    23524, 0x7303a4a6
+0,         11,         11,        1,    23524, 0x1e149aee
+0,         12,         12,        1,    23524, 0x78dd97e0
+0,         13,         13,        1,    23524, 0xad8092d3
+0,         14,         14,        1,    23524, 0x27c090b4
+0,         15,         15,        1,    23524, 0x904c97be
+0,         16,         16,        1,    23524, 0x54d29b9e
+0,         17,         17,        1,    23524, 0x57689bfa
+0,         18,         18,        1,    23524, 0x2772a00e
+0,         19,         19,        1,    23524, 0x6a769ef6
+0,         20,         20,        1,    23524, 0x94d8aad5
+0,         21,         21,        1,    23524, 0x52f79ec4
+0,         22,         22,        1,    23524, 0x99ee9fbc
+0,         23,         23,        1,    23524, 0xbd6a9e4d
+0,         24,         24,        1,    23524, 0xaf4aa1cf
+0,         25,         25,        1,    23524, 0xdb929f98
+0,         26,         26,        1,    23524, 0x9e189a6f
+0,         27,         27,        1,    23524, 0x3ffb9410
+0,         28,         28,        1,    23524, 0x6fc9917d
+0,         29,         29,        1,    23524, 0xe43e94ca
+0,         30,         30,        1,    23524, 0x03b6a24f
+0,         31,         31,        1,    23524, 0xc54f99b3
+0,         32,         32,        1,    23524, 0x4b9a9748
+0,         33,         33,        1,    23524, 0x25a19003
+0,         34,         34,        1,    23524, 0x2b9d77cc
+0,         35,         35,        1,    23524, 0x4a5a9217
+0,         36,         36,        1,    23524, 0x241b9a7c
+0,         37,         37,        1,    23524, 0xc9d39b38
+0,         38,         38,        1,    23524, 0xcca69f30
+0,         39,         39,        1,    23524, 0xe50f9ec9
diff --git a/tests/ref/fate/apng-osample b/tests/ref/fate/apng-osample
new file mode 100644
index 0000000000..5fca5e667d
--- /dev/null
+++ b/tests/ref/fate/apng-osample
@@ -0,0 +1,11 @@
+#tb 0: 3/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 116x135
+#sar 0: 0/1
+0,          0,          0,        1,    62640, 0x31eb581d
+0,          3,          3,        1,    62640, 0x29e11b82
+0,          6,          6,        1,    62640, 0x207ed588
+0,          9,          9,        1,    62640, 0x3845c906
+0,         12,         12,        1,    62640, 0x6797fe69
+0,         15,         15,        1,    62640, 0x1f086a09