diff --git a/pkg/identityserver/store/pagination.go b/pkg/identityserver/store/pagination.go
index a90d2cfe41..aa7ff066d1 100644
--- a/pkg/identityserver/store/pagination.go
+++ b/pkg/identityserver/store/pagination.go
@@ -28,7 +28,7 @@ type PaginationDefaults struct {
 var paginationDefaults = PaginationDefaults{}
 
 // SetPaginationDefaults should only be called at the initialization of the server, never on regitries or
-// auxiliary functions
+// auxiliary functions.
 func SetPaginationDefaults(d PaginationDefaults) { paginationDefaults = d }
 
 type paginationOptionsKeyType struct{}
diff --git a/pkg/identityserver/storetest/api_key_store.go b/pkg/identityserver/storetest/api_key_store.go
index 82af087f4b..cabbfa5375 100644
--- a/pkg/identityserver/storetest/api_key_store.go
+++ b/pkg/identityserver/storetest/api_key_store.go
@@ -268,6 +268,7 @@ func (st *StoreTest) TestAPIKeyStorePagination(t *T) {
 	})
 }
 
+// TestAPIKeyStorePaginationDefaults tests the default pagination values.
 func (st *StoreTest) TestAPIKeyStorePaginationDefaults(t *T) {
 	app1 := st.population.NewApplication(nil)
 
diff --git a/pkg/identityserver/storetest/application_store.go b/pkg/identityserver/storetest/application_store.go
index c8c5836728..9ab3a8704c 100644
--- a/pkg/identityserver/storetest/application_store.go
+++ b/pkg/identityserver/storetest/application_store.go
@@ -361,6 +361,7 @@ func (st *StoreTest) TestApplicationStorePagination(t *T) {
 	})
 }
 
+// TestApplicationStorePaginationDefaults tests the default pagination values.
 func (st *StoreTest) TestApplicationStorePaginationDefaults(t *T) {
 	usr1 := st.population.NewUser()
 
diff --git a/pkg/identityserver/storetest/client_store.go b/pkg/identityserver/storetest/client_store.go
index a026840eb8..38e18b1af0 100644
--- a/pkg/identityserver/storetest/client_store.go
+++ b/pkg/identityserver/storetest/client_store.go
@@ -349,6 +349,7 @@ func (st *StoreTest) TestClientStorePagination(t *T) {
 	})
 }
 
+// TestClientStorePaginationDefaults tests the default pagination values.
 func (st *StoreTest) TestClientStorePaginationDefaults(t *T) {
 	usr1 := st.population.NewUser()
 
diff --git a/pkg/identityserver/storetest/invitation_store.go b/pkg/identityserver/storetest/invitation_store.go
index 41a8e83aec..35fbdf1734 100644
--- a/pkg/identityserver/storetest/invitation_store.go
+++ b/pkg/identityserver/storetest/invitation_store.go
@@ -252,6 +252,7 @@ func (st *StoreTest) TestInvitationStorePagination(t *T) {
 	})
 }
 
+// TestInvitationStorePaginationDefaults tests the default pagination values.
 func (st *StoreTest) TestInvitationStorePaginationDefaults(t *T) {
 	a, ctx := test.New(t)
 	start := time.Now().Truncate(time.Second)
diff --git a/pkg/identityserver/storetest/membership_store.go b/pkg/identityserver/storetest/membership_store.go
index 0c028860cf..a4858f926a 100644
--- a/pkg/identityserver/storetest/membership_store.go
+++ b/pkg/identityserver/storetest/membership_store.go
@@ -390,6 +390,7 @@ func (st *StoreTest) TestMembershipStorePagination(t *T) {
 	})
 }
 
+// TestMembershipStorePaginationDefaults tests the default pagination values.
 func (st *StoreTest) TestMembershipStorePaginationDefaults(t *T) {
 	var apps []*ttnpb.Application
 	for i := 0; i < 102; i++ {
diff --git a/pkg/identityserver/storetest/oauth_store.go b/pkg/identityserver/storetest/oauth_store.go
index f4394cc6f4..18b7c1991b 100644
--- a/pkg/identityserver/storetest/oauth_store.go
+++ b/pkg/identityserver/storetest/oauth_store.go
@@ -452,6 +452,7 @@ func (st *StoreTest) TestOAuthStorePagination(t *T) {
 	})
 }
 
+// TestOAuthStorePaginationDefaults tests the default pagination values.
 func (st *StoreTest) TestOAuthStorePaginationDefaults(t *T) {
 	a, ctx := test.New(t)
 
diff --git a/pkg/identityserver/storetest/organization_store.go b/pkg/identityserver/storetest/organization_store.go
index 3a2e7d2246..1cb0ee4cb0 100644
--- a/pkg/identityserver/storetest/organization_store.go
+++ b/pkg/identityserver/storetest/organization_store.go
@@ -351,12 +351,12 @@ func (st *StoreTest) TestOrganizationStorePagination(t *T) {
 	})
 }
 
+// TestOrganizationStorePaginationDefaults tests the default pagination values.
 func (st *StoreTest) TestOrganizationStorePaginationDefaults(t *T) {
 	usr1 := st.population.NewUser()
 
-	var all []*ttnpb.Organization
 	for i := 0; i < 102; i++ {
-		all = append(all, st.population.NewOrganization(usr1.GetOrganizationOrUserIdentifiers()))
+		st.population.NewOrganization(usr1.GetOrganizationOrUserIdentifiers())
 	}
 
 	s, ok := st.PrepareDB(t).(interface {
diff --git a/pkg/identityserver/storetest/user_session_store.go b/pkg/identityserver/storetest/user_session_store.go
index c366edbf65..b682202535 100644
--- a/pkg/identityserver/storetest/user_session_store.go
+++ b/pkg/identityserver/storetest/user_session_store.go
@@ -230,6 +230,7 @@ func (st *StoreTest) TestUserSessionStorePagination(t *T) {
 	})
 }
 
+// TestUserSessionStorePaginationDefaults tests the default pagination values.
 func (st *StoreTest) TestUserSessionStorePaginationDefaults(t *T) {
 	a, ctx := test.New(t)
 
@@ -254,7 +255,7 @@ func (st *StoreTest) TestUserSessionStorePaginationDefaults(t *T) {
 			t.FailNow()
 		}
 
-		time.Sleep(test.Delay) // The tests depend on sorting by created_at, so we don't want multiple sessions with the same time.
+		time.Sleep(test.Delay)
 	}
 
 	t.Run("FindSessions_PageLimit", func(t *T) {
diff --git a/pkg/identityserver/storetest/user_store.go b/pkg/identityserver/storetest/user_store.go
index 118ee34ab1..55c8f0be91 100644
--- a/pkg/identityserver/storetest/user_store.go
+++ b/pkg/identityserver/storetest/user_store.go
@@ -473,6 +473,7 @@ func (st *StoreTest) TestUserStorePagination(t *T) {
 	})
 }
 
+// TestUserStorePaginationDefaults tests the default pagination values.
 func (st *StoreTest) TestUserStorePaginationDefaults(t *T) {
 	for i := 0; i < 102; i++ {
 		st.population.NewUser()