diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 03617564ee..2224e3e501 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -94,35 +94,16 @@ 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
 
-FATE_SGI += fate-sgi-gray
-fate-sgi-gray: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_gray.sgi -pix_fmt gray
+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
+fate-sgi-$(1)-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/libav_$(1)_rle.sgi -sws_flags +accurate_rnd+bitexact
+endef
 
-FATE_SGI += fate-sgi-gray16
-fate-sgi-gray16: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_gray16.sgi -pix_fmt gray16le
-
-FATE_SGI += fate-sgi-rgb24
-fate-sgi-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_rgb24.sgi -pix_fmt rgb24
-
-FATE_SGI += fate-sgi-rgb24-rle
-fate-sgi-rgb24-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/uvmap_rgb24_rle.sgi -pix_fmt rgb24
-
-FATE_SGI += fate-sgi-rgb48
-fate-sgi-rgb48: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_rgb48.sgi -pix_fmt rgb48be
-
-FATE_SGI += fate-sgi-rgb48-rle
-fate-sgi-rgb48-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/uvmap_rgb48_rle.sgi -pix_fmt rgb48be
-
-FATE_SGI += fate-sgi-rgba
-fate-sgi-rgba: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_rgba.sgi -pix_fmt rgba
-
-FATE_SGI += fate-sgi-rgba64
-fate-sgi-rgba64: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_rgba64.sgi -pix_fmt rgba64be
-
-FATE_SGI += fate-sgi-rgba64-rle
-fate-sgi-rgba64-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/maya_rgba64_rle.sgi -pix_fmt rgba64be
+SGI_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba rgba64
+$(foreach CLSP,$(SGI_COLORSPACES),$(eval $(call FATE_IMGSUITE_SGI,$(CLSP))))
 
 FATE_SGI-$(call DEMDEC, IMAGE2, SGI) += $(FATE_SGI)
-
 FATE_IMAGE += $(FATE_SGI-yes)
 fate-sgi: $(FATE_SGI-yes)
 
diff --git a/tests/ref/fate/sgi-gray b/tests/ref/fate/sgi-gray
deleted file mode 100644
index 4d4d3494fa..0000000000
--- a/tests/ref/fate/sgi-gray
+++ /dev/null
@@ -1,2 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,    65536, 0xe36c12e1
diff --git a/tests/ref/fate/sgi-gray16 b/tests/ref/fate/sgi-gray16
index f56e53eb37..0908746a76 100644
--- a/tests/ref/fate/sgi-gray16
+++ b/tests/ref/fate/sgi-gray16
@@ -1,2 +1,2 @@
 #tb 0: 1/25
-0,          0,          0,        1,   131072, 0x6855d247
+0,          0,          0,        1,   262144, 0x6c27f084
diff --git a/tests/ref/fate/sgi-gray16-rle b/tests/ref/fate/sgi-gray16-rle
new file mode 100644
index 0000000000..09903d5ba9
--- /dev/null
+++ b/tests/ref/fate/sgi-gray16-rle
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,   262144, 0x65ef57ff
diff --git a/tests/ref/fate/sgi-gray8 b/tests/ref/fate/sgi-gray8
new file mode 100644
index 0000000000..b0e060699c
--- /dev/null
+++ b/tests/ref/fate/sgi-gray8
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,   131072, 0xb0702a94
diff --git a/tests/ref/fate/sgi-gray8-rle b/tests/ref/fate/sgi-gray8-rle
new file mode 100644
index 0000000000..b0e060699c
--- /dev/null
+++ b/tests/ref/fate/sgi-gray8-rle
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,   131072, 0xb0702a94
diff --git a/tests/ref/fate/sgi-rgb24 b/tests/ref/fate/sgi-rgb24
index 7a6e85537f..30aca1cead 100644
--- a/tests/ref/fate/sgi-rgb24
+++ b/tests/ref/fate/sgi-rgb24
@@ -1,2 +1,2 @@
 #tb 0: 1/25
-0,          0,          0,        1,   196608, 0x5b24c51a
+0,          0,          0,        1,   393216, 0xa9b28fd9
diff --git a/tests/ref/fate/sgi-rgb48 b/tests/ref/fate/sgi-rgb48
index b0521b7fc5..8f3ca50b10 100644
--- a/tests/ref/fate/sgi-rgb48
+++ b/tests/ref/fate/sgi-rgb48
@@ -1,2 +1,2 @@
 #tb 0: 1/25
-0,          0,          0,        1,   393216, 0xf6b0d73a
+0,          0,          0,        1,   786432, 0xee4aa667
diff --git a/tests/ref/fate/sgi-rgba b/tests/ref/fate/sgi-rgba
index 9b3d4cb793..058f5f99c3 100644
--- a/tests/ref/fate/sgi-rgba
+++ b/tests/ref/fate/sgi-rgba
@@ -1,2 +1,2 @@
 #tb 0: 1/25
-0,          0,          0,        1,   262144, 0x7b38d40b
+0,          0,          0,        1,   524288, 0x4ee5adbb
diff --git a/tests/ref/fate/sgi-rgba-rle b/tests/ref/fate/sgi-rgba-rle
new file mode 100644
index 0000000000..058f5f99c3
--- /dev/null
+++ b/tests/ref/fate/sgi-rgba-rle
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,   524288, 0x4ee5adbb
diff --git a/tests/ref/fate/sgi-rgba64 b/tests/ref/fate/sgi-rgba64
index 94e35afd34..f4e939ec73 100644
--- a/tests/ref/fate/sgi-rgba64
+++ b/tests/ref/fate/sgi-rgba64
@@ -1,2 +1,2 @@
 #tb 0: 1/25
-0,          0,          0,        1,   524288, 0xce70f51c
+0,          0,          0,        1,  1048576, 0xc657e22b
diff --git a/tests/ref/fate/sgi-rgba64-rle b/tests/ref/fate/sgi-rgba64-rle
index 1dfac760fc..cdf5fd0e32 100644
--- a/tests/ref/fate/sgi-rgba64-rle
+++ b/tests/ref/fate/sgi-rgba64-rle
@@ -1,2 +1,2 @@
 #tb 0: 1/25
-0,          0,          0,        1,   614400, 0xb92d409d
+0,          0,          0,        1,  1048576, 0xb619d0f1