diff --git a/internal/service/blob/get_blob_test.go b/internal/service/blob/get_blob_test.go
index 4f5bb7a37c6acec3ba7167e7c660b20ce62215b0..d2a94306df08c74222b75c8275a56793a594e984 100644
--- a/internal/service/blob/get_blob_test.go
+++ b/internal/service/blob/get_blob_test.go
@@ -158,8 +158,8 @@ func TestFailedGetBlobRequestDueToValidationError(t *testing.T) {
 
 	rpcRequests := []gitalypb.GetBlobRequest{
 		{Repository: &gitalypb.Repository{StorageName: "fake", RelativePath: "path"}, Oid: oid}, // Repository doesn't exist
-		{Repository: nil, Oid: oid}, // Repository is nil
-		{Repository: testRepo},      // Oid is empty
+		{Repository: nil, Oid: oid},                                                             // Repository is nil
+		{Repository: testRepo},                                                                  // Oid is empty
 	}
 
 	for _, rpcRequest := range rpcRequests {
diff --git a/internal/service/commit/count_commits_test.go b/internal/service/commit/count_commits_test.go
index ec0acae174c6eb93c025933ce77719e2b4ca2b29..1142448f09d3c2252d7b32a2efbded412115df2e 100644
--- a/internal/service/commit/count_commits_test.go
+++ b/internal/service/commit/count_commits_test.go
@@ -177,8 +177,8 @@ func TestFailedCountCommitsRequestDueToValidationError(t *testing.T) {
 
 	rpcRequests := []gitalypb.CountCommitsRequest{
 		{Repository: &gitalypb.Repository{StorageName: "fake", RelativePath: "path"}, Revision: revision}, // Repository doesn't exist
-		{Repository: nil, Revision: revision},             // Repository is nil
-		{Repository: testRepo, Revision: nil, All: false}, // Revision is empty and All is false
+		{Repository: nil, Revision: revision},                                                             // Repository is nil
+		{Repository: testRepo, Revision: nil, All: false},                                                 // Revision is empty and All is false
 	}
 
 	for _, rpcRequest := range rpcRequests {
diff --git a/internal/service/diff/commit_test.go b/internal/service/diff/commit_test.go
index 6c0feb938fa4a033fdb90769b3d4e9f89e2e2015..2063a876f225ca9bfeaf077401ff973db7e31767 100644
--- a/internal/service/diff/commit_test.go
+++ b/internal/service/diff/commit_test.go
@@ -406,7 +406,7 @@ func TestSuccessfulCommitDiffRequestWithIgnoreWhitespaceChange(t *testing.T) {
 				RightCommitId:          rightCommit,
 				LeftCommitId:           leftCommit,
 				IgnoreWhitespaceChange: true,
-				Paths:                  entry.paths,
+				Paths: entry.paths,
 			}
 
 			ctx, cancel := context.WithCancel(context.Background())
diff --git a/internal/service/smarthttp/receive_pack_test.go b/internal/service/smarthttp/receive_pack_test.go
index 679270f7ac17fee420dfe4ca7b7e134f9630f4b1..547e07e76743f1fdba952ecc1f279c91b68759b1 100644
--- a/internal/service/smarthttp/receive_pack_test.go
+++ b/internal/service/smarthttp/receive_pack_test.go
@@ -267,8 +267,8 @@ func TestFailedReceivePackRequestDueToValidationError(t *testing.T) {
 	defer conn.Close()
 
 	rpcRequests := []gitalypb.PostReceivePackRequest{
-		{Repository: &gitalypb.Repository{StorageName: "fake", RelativePath: "path"}, GlId: "user-123"}, // Repository doesn't exist
-		{Repository: nil, GlId: "user-123"}, // Repository is nil
+		{Repository: &gitalypb.Repository{StorageName: "fake", RelativePath: "path"}, GlId: "user-123"},                                  // Repository doesn't exist
+		{Repository: nil, GlId: "user-123"},                                                                                              // Repository is nil
 		{Repository: &gitalypb.Repository{StorageName: "default", RelativePath: "path/to/repo"}, GlId: ""},                               // Empty GlId
 		{Repository: &gitalypb.Repository{StorageName: "default", RelativePath: "path/to/repo"}, GlId: "user-123", Data: []byte("Fail")}, // Data exists on first request
 	}