3 files changed, 7 insertions, 10 deletions
diff --git a/internal/api/auth/authorize_test.go b/internal/api/auth/authorize_test.go
index b73f5e0e1..56a05416b 100644
--- a/internal/api/auth/authorize_test.go
+++ b/internal/api/auth/authorize_test.go
@@ -1,7 +1,6 @@
 package auth_test
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"testing"
@@ -93,9 +92,9 @@ func (suite *AuthAuthorizeTestSuite) TestAccountAuthorizeHandler() {
 
 		testCase.description = fmt.Sprintf("%s, %t, %s", user.Email, *user.Disabled, account.SuspendedAt)
 
-		err := suite.db.UpdateUser(context.Background(), user, columns...)
+		err := suite.db.UpdateUser(suite.T().Context(), user, columns...)
 		suite.NoError(err)
-		err = suite.db.UpdateAccount(context.Background(), account)
+		err = suite.db.UpdateAccount(suite.T().Context(), account)
 		suite.NoError(err)
 
 		// call the handler
diff --git a/internal/api/auth/revoke_test.go b/internal/api/auth/revoke_test.go
index e482c8aac..3af573411 100644
--- a/internal/api/auth/revoke_test.go
+++ b/internal/api/auth/revoke_test.go
@@ -19,7 +19,6 @@ package auth_test
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"io"
 	"net/http"
@@ -71,7 +70,7 @@ func (suite *RevokeTestSuite) TestRevokeOK() {
 
 	// Ensure token now gone.
 	_, err = suite.state.DB.GetTokenByAccess(
-		context.Background(),
+		suite.T().Context(),
 		token.Access,
 	)
 	suite.ErrorIs(err, db.ErrNoEntries)
@@ -130,7 +129,7 @@ func (suite *RevokeTestSuite) TestRevokeWrongSecret() {
 
 	// Ensure token still there.
 	_, err = suite.state.DB.GetTokenByAccess(
-		context.Background(),
+		suite.T().Context(),
 		token.Access,
 	)
 	suite.NoError(err)
@@ -188,7 +187,7 @@ func (suite *RevokeTestSuite) TestRevokeNoClientID() {
 
 	// Ensure token still there.
 	_, err = suite.state.DB.GetTokenByAccess(
-		context.Background(),
+		suite.T().Context(),
 		token.Access,
 	)
 	suite.NoError(err)
diff --git a/internal/api/auth/token_test.go b/internal/api/auth/token_test.go
index e333a8867..5d1aa4df5 100644
--- a/internal/api/auth/token_test.go
+++ b/internal/api/auth/token_test.go
@@ -18,7 +18,6 @@
 package auth_test
 
 import (
-	"context"
 	"encoding/json"
 	"io"
 	"net/http"
@@ -93,7 +92,7 @@ func (suite *TokenTestSuite) TestRetrieveClientCredentialsOK() {
 
 	// there should be a token in the database now too
 	dbToken := &gtsmodel.Token{}
-	err = suite.db.GetWhere(context.Background(), []db.Where{{Key: "access", Value: t.AccessToken}}, dbToken)
+	err = suite.db.GetWhere(suite.T().Context(), []db.Where{{Key: "access", Value: t.AccessToken}}, dbToken)
 	suite.NoError(err)
 	suite.NotNil(dbToken)
 }
@@ -204,7 +203,7 @@ func (suite *TokenTestSuite) TestRetrieveAuthorizationCodeOK() {
 	suite.WithinDuration(time.Now(), time.Unix(t.CreatedAt, 0), 1*time.Minute)
 
 	dbToken := &gtsmodel.Token{}
-	err = suite.db.GetWhere(context.Background(), []db.Where{{Key: "access", Value: t.AccessToken}}, dbToken)
+	err = suite.db.GetWhere(suite.T().Context(), []db.Where{{Key: "access", Value: t.AccessToken}}, dbToken)
 	suite.NoError(err)
 	suite.NotNil(dbToken)
 }