diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index b1ddce1ed2..f91ee6996f 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -59,6 +59,18 @@ fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
 FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
 fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/libav_4x_concat.png -pix_fmt rgba
 
+define FATE_IMGSUITE_PNG
+FATE_PNG += fate-png-$(1)
+fate-png-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/png1/libav_$(1).png -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24
+endef
+
+PNG_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba ya8 ya16
+$(foreach CLSP,$(PNG_COLORSPACES),$(eval $(call FATE_IMGSUITE_PNG,$(CLSP))))
+
+FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG)
+FATE_SAMPLES_AVCONV += $(FATE_PNG-yes)
+fate-png: $(FATE_PNG-yes)
+
 FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
 fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
 
diff --git a/tests/ref/fate/png-gray16 b/tests/ref/fate/png-gray16
new file mode 100644
index 0000000000..7bd73d84d0
--- /dev/null
+++ b/tests/ref/fate/png-gray16
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,   203280, 0x56c92114
diff --git a/tests/ref/fate/png-gray8 b/tests/ref/fate/png-gray8
new file mode 100644
index 0000000000..5b3096826b
--- /dev/null
+++ b/tests/ref/fate/png-gray8
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,   203280, 0xe5df9033
diff --git a/tests/ref/fate/png-rgb24 b/tests/ref/fate/png-rgb24
new file mode 100644
index 0000000000..ed819cef61
--- /dev/null
+++ b/tests/ref/fate/png-rgb24
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,   203280, 0x57fff840
diff --git a/tests/ref/fate/png-rgb48 b/tests/ref/fate/png-rgb48
new file mode 100644
index 0000000000..8bd0445663
--- /dev/null
+++ b/tests/ref/fate/png-rgb48
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,   203280, 0x764801bb
diff --git a/tests/ref/fate/png-rgba b/tests/ref/fate/png-rgba
new file mode 100644
index 0000000000..eb473ced21
--- /dev/null
+++ b/tests/ref/fate/png-rgba
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,   203280, 0xb30c9da7
diff --git a/tests/ref/fate/png-ya16 b/tests/ref/fate/png-ya16
new file mode 100644
index 0000000000..b932700295
--- /dev/null
+++ b/tests/ref/fate/png-ya16
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,   203280, 0xf1b83aeb
diff --git a/tests/ref/fate/png-ya8 b/tests/ref/fate/png-ya8
new file mode 100644
index 0000000000..9ce98f698d
--- /dev/null
+++ b/tests/ref/fate/png-ya8
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,   203280, 0xe77c008e