3 files changed, 6 insertions, 9 deletions
diff --git a/internal/processing/media/getemoji_test.go b/internal/processing/media/getemoji_test.go
index eeb1e5020..0e2c2d0cc 100644
--- a/internal/processing/media/getemoji_test.go
+++ b/internal/processing/media/getemoji_test.go
@@ -18,7 +18,6 @@
 package media_test
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -29,7 +28,7 @@ type GetEmojiTestSuite struct {
 }
 
 func (suite *GetEmojiTestSuite) TestGetCustomEmojis() {
-	emojis, err := suite.mediaProcessor.GetCustomEmojis(context.Background())
+	emojis, err := suite.mediaProcessor.GetCustomEmojis(suite.T().Context())
 
 	suite.NoError(err)
 	suite.Equal(1, len(emojis))
diff --git a/internal/processing/media/getfile_test.go b/internal/processing/media/getfile_test.go
index cde0864f8..9c2ffd589 100644
--- a/internal/processing/media/getfile_test.go
+++ b/internal/processing/media/getfile_test.go
@@ -18,7 +18,6 @@
 package media_test
 
 import (
-	"context"
 	"io"
 	"path"
 	"testing"
@@ -36,7 +35,7 @@ type GetFileTestSuite struct {
 }
 
 func (suite *GetFileTestSuite) TestGetRemoteFileCached() {
-	ctx := context.Background()
+	ctx := suite.T().Context()
 
 	testAttachment := suite.testAttachments["remote_account_1_status_1_attachment_1"]
 	fileName := path.Base(testAttachment.File.Path)
@@ -64,7 +63,7 @@ func (suite *GetFileTestSuite) TestGetRemoteFileCached() {
 }
 
 func (suite *GetFileTestSuite) TestGetRemoteFileUncached() {
-	ctx := context.Background()
+	ctx := suite.T().Context()
 
 	// uncache the file from local
 	testAttachment := suite.testAttachments["remote_account_1_status_1_attachment_1"]
@@ -116,7 +115,7 @@ func (suite *GetFileTestSuite) TestGetRemoteFileUncached() {
 }
 
 func (suite *GetFileTestSuite) TestGetRemoteFileUncachedInterrupted() {
-	ctx := context.Background()
+	ctx := suite.T().Context()
 
 	// uncache the file from local
 	testAttachment := suite.testAttachments["remote_account_1_status_1_attachment_1"]
@@ -163,7 +162,7 @@ func (suite *GetFileTestSuite) TestGetRemoteFileUncachedInterrupted() {
 }
 
 func (suite *GetFileTestSuite) TestGetRemoteFileThumbnailUncached() {
-	ctx := context.Background()
+	ctx := suite.T().Context()
 	testAttachment := suite.testAttachments["remote_account_1_status_1_attachment_1"]
 
 	// fetch the existing thumbnail bytes from storage first
diff --git a/internal/processing/media/unattach_test.go b/internal/processing/media/unattach_test.go
index 02d2c7077..582e24b9a 100644
--- a/internal/processing/media/unattach_test.go
+++ b/internal/processing/media/unattach_test.go
@@ -18,7 +18,6 @@
 package media_test
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -29,7 +28,7 @@ type UnattachTestSuite struct {
 }
 
 func (suite *UnattachTestSuite) TestUnattachMedia() {
-	ctx := context.Background()
+	ctx := suite.T().Context()
 
 	testAttachment := suite.testAttachments["admin_account_status_1_attachment_1"]
 	testAccount := suite.testAccounts["admin_account"]