diff --git a/tests/integration/db_collation_test.go b/tests/integration/db_collation_test.go
index bf55bdd8ee..c41209f1fe 100644
--- a/tests/integration/db_collation_test.go
+++ b/tests/integration/db_collation_test.go
@@ -7,6 +7,7 @@ package integration
 import (
 	"net/http"
 	"testing"
+	"time"
 
 	"forgejo.org/models/db"
 	"forgejo.org/modules/setting"
@@ -97,9 +98,13 @@ func TestDatabaseCollation(t *testing.T) {
 		defer test.MockVariableValue(&setting.Database.CharsetCollation, "utf8mb4_bin")()
 		require.NoError(t, db.ConvertDatabaseTable())
 
-		r, err := db.CheckCollations(x)
-		require.NoError(t, err)
-		assert.Equal(t, "utf8mb4_bin", r.DatabaseCollation)
+		var r *db.CheckCollationsResult
+		assert.Eventually(t, func() bool {
+			r, err = db.CheckCollations(x)
+			require.NoError(t, err)
+
+			return r.DatabaseCollation == "utf8mb4_bin"
+		}, time.Second*30, time.Second)
 		assert.True(t, r.CollationEquals(r.ExpectedCollation, r.DatabaseCollation))
 		assert.Empty(t, r.InconsistentCollationColumns)
 
@@ -117,9 +122,13 @@ func TestDatabaseCollation(t *testing.T) {
 		defer test.MockVariableValue(&setting.Database.CharsetCollation, "utf8mb4_general_ci")()
 		require.NoError(t, db.ConvertDatabaseTable())
 
-		r, err := db.CheckCollations(x)
-		require.NoError(t, err)
-		assert.Equal(t, "utf8mb4_general_ci", r.DatabaseCollation)
+		var r *db.CheckCollationsResult
+		assert.Eventually(t, func() bool {
+			r, err = db.CheckCollations(x)
+			require.NoError(t, err)
+
+			return r.DatabaseCollation == "utf8mb4_general_ci"
+		}, time.Second*30, time.Second)
 		assert.True(t, r.CollationEquals(r.ExpectedCollation, r.DatabaseCollation))
 		assert.Empty(t, r.InconsistentCollationColumns)
 
@@ -137,9 +146,15 @@ func TestDatabaseCollation(t *testing.T) {
 		defer test.MockVariableValue(&setting.Database.CharsetCollation, "")()
 		require.NoError(t, db.ConvertDatabaseTable())
 
+		var r *db.CheckCollationsResult
 		r, err := db.CheckCollations(x)
 		require.NoError(t, err)
-		assert.True(t, r.IsCollationCaseSensitive(r.DatabaseCollation))
+		assert.Eventually(t, func() bool {
+			r, err = db.CheckCollations(x)
+			require.NoError(t, err)
+
+			return r.IsCollationCaseSensitive(r.DatabaseCollation)
+		}, time.Second*30, time.Second)
 		assert.True(t, r.CollationEquals(r.ExpectedCollation, r.DatabaseCollation))
 		assert.Empty(t, r.InconsistentCollationColumns)
 	})