diff --git a/models/migrations/v1_25/v321.go b/models/migrations/v1_25/v321.go
index 781174b1ba..e5f1a63ba2 100644
--- a/models/migrations/v1_25/v321.go
+++ b/models/migrations/v1_25/v321.go
@@ -5,6 +5,7 @@ package v1_25 //nolint
 
 import (
 	"code.gitea.io/gitea/modules/timeutil"
+
 	"xorm.io/xorm"
 	"xorm.io/xorm/schemas"
 )
diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go
index 74ec80727b..b348ba2f0c 100644
--- a/routers/web/repo/release.go
+++ b/routers/web/repo/release.go
@@ -11,6 +11,7 @@ import (
 	"strconv"
 	"strings"
 
+	activities_model "code.gitea.io/gitea/models/activities"
 	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
 	"code.gitea.io/gitea/models/renderhelper"
@@ -31,7 +32,6 @@ import (
 	"code.gitea.io/gitea/services/context/upload"
 	"code.gitea.io/gitea/services/forms"
 	release_service "code.gitea.io/gitea/services/release"
-	activities_model "code.gitea.io/gitea/models/activities"
 )
 
 const (
diff --git a/tests/integration/api_notification_test.go b/tests/integration/api_notification_test.go
index f556e1912c..f17011db57 100644
--- a/tests/integration/api_notification_test.go
+++ b/tests/integration/api_notification_test.go
@@ -252,13 +252,13 @@ func TestAPICommitNotification(t *testing.T) {
 
 		req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/new_commit_notification.txt", user2.Name, repo1.Name), &createFileOptions).
 			AddTokenAuth(token1)
-		resp := MakeRequest(t, req, http.StatusCreated)
+		MakeRequest(t, req, http.StatusCreated)
 
 		// Check notifications are as expected
 		token2 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteNotification)
 		req = NewRequest(t, "GET", "/api/v1/notifications?all=true").
 			AddTokenAuth(token2)
-		resp = MakeRequest(t, req, http.StatusOK)
+		resp := MakeRequest(t, req, http.StatusOK)
 		var apiNL []api.NotificationThread
 		DecodeJSON(t, resp, &apiNL)