diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 167113105d..17c9245f49 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -289,6 +289,31 @@ 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
 
+define FATE_IMGSUITE_PSD
+FATE_PSD += fate-psd-$(1)
+fate-psd-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-$(1).psd -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24
+endef
+
+PSD_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba rgba64 ya8 ya16
+$(foreach CLSP,$(PSD_COLORSPACES),$(eval $(call FATE_IMGSUITE_PSD,$(CLSP))))
+
+FATE_PSD += fate-psd-lena-127x127-rgb24
+fate-psd-lena-127x127-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-127x127_rgb24.psd
+
+FATE_PSD += fate-psd-lena-rgb-rle-127x127-16b
+fate-psd-lena-rgb-rle-127x127-16b: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-rgb_rle_127x127_16b.psd
+
+FATE_PSD += fate-psd-lena-rgb-rle-127x127-8b
+fate-psd-lena-rgb-rle-127x127-8b: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-rgb_rle_127x127_8b.psd
+
+FATE_PSD += fate-psd-lena-rgba-rle-128x128-8b
+fate-psd-lena-rgba-rle-128x128-8b: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-rgba_rle_128x128_8b.psd
+
+FATE_PSD-$(call DEMDEC, IMAGE2, PSD) += $(FATE_PSD)
+
+FATE_IMAGE += $(FATE_PSD-yes)
+fate-psd: $(FATE_PSD-yes)
+
 define FATE_IMGSUITE_SGI
 FATE_SGI += fate-sgi-$(1) fate-sgi-$(1)-rle
 fate-sgi-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/sgi/libav_$(1).sgi -sws_flags +accurate_rnd+bitexact
diff --git a/tests/ref/fate/psd-gray16 b/tests/ref/fate/psd-gray16
new file mode 100644
index 0000000000..668af669ad
--- /dev/null
+++ b/tests/ref/fate/psd-gray16
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xce3477d3
diff --git a/tests/ref/fate/psd-gray8 b/tests/ref/fate/psd-gray8
new file mode 100644
index 0000000000..1d8dc49f8d
--- /dev/null
+++ b/tests/ref/fate/psd-gray8
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0x55121b03
diff --git a/tests/ref/fate/psd-lena-127x127-rgb24 b/tests/ref/fate/psd-lena-127x127-rgb24
new file mode 100644
index 0000000000..2644f40c12
--- /dev/null
+++ b/tests/ref/fate/psd-lena-127x127-rgb24
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x127
+#sar 0: 0/1
+0,          0,          0,        1,    48387, 0xd7b6bec4
diff --git a/tests/ref/fate/psd-lena-rgb-rle-127x127-16b b/tests/ref/fate/psd-lena-rgb-rle-127x127-16b
new file mode 100644
index 0000000000..c065939581
--- /dev/null
+++ b/tests/ref/fate/psd-lena-rgb-rle-127x127-16b
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x127
+#sar 0: 0/1
+0,          0,          0,        1,    96774, 0xaab6cc1d
diff --git a/tests/ref/fate/psd-lena-rgb-rle-127x127-8b b/tests/ref/fate/psd-lena-rgb-rle-127x127-8b
new file mode 100644
index 0000000000..ac3b4a9473
--- /dev/null
+++ b/tests/ref/fate/psd-lena-rgb-rle-127x127-8b
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x127
+#sar 0: 0/1
+0,          0,          0,        1,    48387, 0x35b27b60
diff --git a/tests/ref/fate/psd-lena-rgba-rle-128x128-8b b/tests/ref/fate/psd-lena-rgba-rle-128x128-8b
new file mode 100644
index 0000000000..f3a11b7c5c
--- /dev/null
+++ b/tests/ref/fate/psd-lena-rgba-rle-128x128-8b
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    65536, 0xaaacdff3
diff --git a/tests/ref/fate/psd-rgb24 b/tests/ref/fate/psd-rgb24
new file mode 100644
index 0000000000..7f8f550afe
--- /dev/null
+++ b/tests/ref/fate/psd-rgb24
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xe0013dee
diff --git a/tests/ref/fate/psd-rgb48 b/tests/ref/fate/psd-rgb48
new file mode 100644
index 0000000000..f60cbab078
--- /dev/null
+++ b/tests/ref/fate/psd-rgb48
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0x0bc6503a
diff --git a/tests/ref/fate/psd-rgba b/tests/ref/fate/psd-rgba
new file mode 100644
index 0000000000..672898093d
--- /dev/null
+++ b/tests/ref/fate/psd-rgba
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xb2563b4a
diff --git a/tests/ref/fate/psd-rgba64 b/tests/ref/fate/psd-rgba64
new file mode 100644
index 0000000000..e51686767e
--- /dev/null
+++ b/tests/ref/fate/psd-rgba64
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xb847fd73
diff --git a/tests/ref/fate/psd-ya16 b/tests/ref/fate/psd-ya16
new file mode 100644
index 0000000000..96582ebe7f
--- /dev/null
+++ b/tests/ref/fate/psd-ya16
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xe8f08af3
diff --git a/tests/ref/fate/psd-ya8 b/tests/ref/fate/psd-ya8
new file mode 100644
index 0000000000..9a59fbf5a8
--- /dev/null
+++ b/tests/ref/fate/psd-ya8
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xfa0ee1d0