diff --git a/utils/emoji.go b/utils/emoji.go
index d7e8a8b126..6797e5e0a2 100644
--- a/utils/emoji.go
+++ b/utils/emoji.go
@@ -11,14 +11,15 @@ import (
 	"image/jpeg"
 	"image/png"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func CreateTestGif(t *testing.T, width int, height int) []byte {
 	var buffer bytes.Buffer
 
-	if err := gif.Encode(&buffer, image.NewRGBA(image.Rect(0, 0, width, height)), nil); err != nil {
-		t.Fatalf("failed to create gif: %v", err.Error())
-	}
+	err := gif.Encode(&buffer, image.NewRGBA(image.Rect(0, 0, width, height)), nil)
+	require.NoErrorf(t, err, "failed to create gif: %v", err)
 
 	return buffer.Bytes()
 }
@@ -34,9 +35,8 @@ func CreateTestAnimatedGif(t *testing.T, width int, height int, frames int) []by
 		img.Image[i] = image.NewPaletted(image.Rect(0, 0, width, height), color.Palette{color.Black})
 		img.Delay[i] = 0
 	}
-	if err := gif.EncodeAll(&buffer, &img); err != nil {
-		t.Fatalf("failed to create animated gif: %v", err.Error())
-	}
+	err := gif.EncodeAll(&buffer, &img)
+	require.NoErrorf(t, err, "failed to create animated gif: %v", err)
 
 	return buffer.Bytes()
 }
@@ -44,9 +44,8 @@ func CreateTestAnimatedGif(t *testing.T, width int, height int, frames int) []by
 func CreateTestJpeg(t *testing.T, width int, height int) []byte {
 	var buffer bytes.Buffer
 
-	if err := jpeg.Encode(&buffer, image.NewRGBA(image.Rect(0, 0, width, height)), nil); err != nil {
-		t.Fatalf("failed to create jpeg: %v", err.Error())
-	}
+	err := jpeg.Encode(&buffer, image.NewRGBA(image.Rect(0, 0, width, height)), nil)
+	require.NoErrorf(t, err, "failed to create jpeg: %v", err)
 
 	return buffer.Bytes()
 }
@@ -54,9 +53,8 @@ func CreateTestJpeg(t *testing.T, width int, height int) []byte {
 func CreateTestPng(t *testing.T, width int, height int) []byte {
 	var buffer bytes.Buffer
 
-	if err := png.Encode(&buffer, image.NewRGBA(image.Rect(0, 0, width, height))); err != nil {
-		t.Fatalf("failed to create png: %v", err.Error())
-	}
+	err := png.Encode(&buffer, image.NewRGBA(image.Rect(0, 0, width, height)))
+	require.NoErrorf(t, err, "failed to create png: %v", err)
 
 	return buffer.Bytes()
 }