diff --git a/pkg/services/folder/folderimpl/sqlstore_test.go b/pkg/services/folder/folderimpl/sqlstore_test.go
index f844e525220..3ab31583b80 100644
--- a/pkg/services/folder/folderimpl/sqlstore_test.go
+++ b/pkg/services/folder/folderimpl/sqlstore_test.go
@@ -25,7 +25,6 @@ func TestIntegrationCreate(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	t.Skip("skipping until folder migration is merged")
 
 	db := sqlstore.InitTestDB(t)
 	folderStore := ProvideStore(db, db.Cfg, &featuremgmt.FeatureManager{})
@@ -141,7 +140,6 @@ func TestIntegrationDelete(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	t.Skip("skipping until folder migration is merged")
 
 	db := sqlstore.InitTestDB(t)
 	folderStore := ProvideStore(db, db.Cfg, &featuremgmt.FeatureManager{})
@@ -189,7 +187,6 @@ func TestIntegrationUpdate(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	t.Skip("skipping until folder migration is merged")
 
 	db := sqlstore.InitTestDB(t)
 	folderStore := ProvideStore(db, db.Cfg, &featuremgmt.FeatureManager{})
@@ -294,7 +291,6 @@ func TestIntegrationGet(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	t.Skip("skipping until folder migration is merged")
 
 	db := sqlstore.InitTestDB(t)
 	folderStore := ProvideStore(db, db.Cfg, &featuremgmt.FeatureManager{})
@@ -373,7 +369,6 @@ func TestIntegrationGetParents(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	t.Skip("skipping until folder migration is merged")
 
 	db := sqlstore.InitTestDB(t)
 	folderStore := ProvideStore(db, db.Cfg, &featuremgmt.FeatureManager{})
@@ -440,7 +435,6 @@ func TestIntegrationGetChildren(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	t.Skip("skipping until folder migration is merged")
 
 	db := sqlstore.InitTestDB(t)
 	folderStore := ProvideStore(db, db.Cfg, &featuremgmt.FeatureManager{})
@@ -594,7 +588,6 @@ func TestIntegrationGetHeight(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	t.Skip("skipping until folder migration is merged")
 
 	db := sqlstore.InitTestDB(t)
 	folderStore := ProvideStore(db, db.Cfg, &featuremgmt.FeatureManager{})
diff --git a/pkg/services/sqlstore/migrations/folder_mig.go b/pkg/services/sqlstore/migrations/folder_mig.go
index faf74c64ed0..03dcb60ba01 100644
--- a/pkg/services/sqlstore/migrations/folder_mig.go
+++ b/pkg/services/sqlstore/migrations/folder_mig.go
@@ -16,6 +16,12 @@ func addFolderMigrations(mg *migrator.Migrator) {
 		Cols: []string{"uid", "org_id"},
 	}))
 
+	mg.AddMigration("Update folder title length", migrator.NewTableCharsetMigration("folder", []*migrator.Column{
+		// it should be lower than 191 (the maximum length of indexable VARCHAR fields in MySQL 5.6 <= with utf8mb4 encoding)
+		// but the title column length of the dashboard table whose values are copied into this column is 189
+		{Name: "title", Type: migrator.DB_NVarchar, Length: 189, Nullable: false},
+	}))
+
 	mg.AddMigration("Add unique index for folder.title and folder.parent_uid", migrator.NewAddIndexMigration(folderv1(), &migrator.Index{
 		Type: migrator.UniqueIndex,
 		Cols: []string{"title", "parent_uid"},