diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index cd589f69cc..89b91aa189 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_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
 fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png -pix_fmt rgba
 
+define FATE_IMGSUITE_PNG
+FATE_PNG += fate-png-$(1)
+fate-png-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/png1/lena-$(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_IMAGE += $(FATE_PNG-yes)
+fate-png: $(FATE_PNG-yes)
+
 FATE_IMAGE-$(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..66fc601850
--- /dev/null
+++ b/tests/ref/fate/png-gray16
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    49152, 0xc71b77cd
diff --git a/tests/ref/fate/png-gray8 b/tests/ref/fate/png-gray8
new file mode 100644
index 0000000000..9d30db6516
--- /dev/null
+++ b/tests/ref/fate/png-gray8
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    49152, 0x55121b03
diff --git a/tests/ref/fate/png-rgb24 b/tests/ref/fate/png-rgb24
new file mode 100644
index 0000000000..c383836853
--- /dev/null
+++ b/tests/ref/fate/png-rgb24
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    49152, 0xe0013dee
diff --git a/tests/ref/fate/png-rgb48 b/tests/ref/fate/png-rgb48
new file mode 100644
index 0000000000..b1159f1867
--- /dev/null
+++ b/tests/ref/fate/png-rgb48
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    49152, 0xcf0e902a
diff --git a/tests/ref/fate/png-rgba b/tests/ref/fate/png-rgba
new file mode 100644
index 0000000000..f20fe0c693
--- /dev/null
+++ b/tests/ref/fate/png-rgba
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    49152, 0x5017bc21
diff --git a/tests/ref/fate/png-ya16 b/tests/ref/fate/png-ya16
new file mode 100644
index 0000000000..07906c4a70
--- /dev/null
+++ b/tests/ref/fate/png-ya16
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    49152, 0x93ce1cd5
diff --git a/tests/ref/fate/png-ya8 b/tests/ref/fate/png-ya8
new file mode 100644
index 0000000000..3a5c99d9eb
--- /dev/null
+++ b/tests/ref/fate/png-ya8
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    49152, 0xed73bf03