diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs
index 2a3c4652af..7b9fbd35fe 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs
@@ -70,9 +70,10 @@ namespace Volo.Abp.Cli.Commands
 
         private string FindTenantDbContextName(string dbMigrationsFolder)
         {
-            var tenantDbContext = Directory
-                .GetFiles(dbMigrationsFolder, "*TenantMigrationsDbContext.cs", SearchOption.AllDirectories)
-                .FirstOrDefault();
+            var tenantDbContext = Directory.GetFiles(dbMigrationsFolder, "*TenantMigrationsDbContext.cs", SearchOption.AllDirectories)
+                                      .FirstOrDefault() ??
+                                  Directory.GetFiles(dbMigrationsFolder, "*TenantDbContext.cs", SearchOption.AllDirectories)
+                                      .FirstOrDefault();
 
             if (tenantDbContext == null)
             {
@@ -84,9 +85,10 @@ namespace Volo.Abp.Cli.Commands
 
         private string FindDbContextName(string dbMigrationsFolder)
         {
-            var dbContext = Directory
-                .GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories)
-                .FirstOrDefault(fp => !fp.EndsWith("TenantMigrationsDbContext.cs"));
+            var dbContext = Directory.GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories)
+                                .FirstOrDefault(fp => !fp.EndsWith("TenantMigrationsDbContext.cs")) ??
+                            Directory.GetFiles(dbMigrationsFolder, "*DbContext.cs", SearchOption.AllDirectories)
+                                .FirstOrDefault(fp => !fp.EndsWith("TenantDbContext.cs"));
 
             if (dbContext == null)
             {
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs
index 8143acf7b8..05996b90d7 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs
@@ -69,9 +69,10 @@ namespace Volo.Abp.Cli.ProjectModification
 
         protected virtual string FindDbContextName(string dbMigrationsFolder)
         {
-            var dbContext = Directory
-                .GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories)
-                .FirstOrDefault(fp => !fp.EndsWith("TenantMigrationsDbContext.cs"));
+            var dbContext = Directory.GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories)
+                                .FirstOrDefault(fp => !fp.EndsWith("TenantMigrationsDbContext.cs")) ??
+                            Directory.GetFiles(dbMigrationsFolder, "*DbContext.cs", SearchOption.AllDirectories)
+                                .FirstOrDefault(fp => !fp.EndsWith("TenantDbContext.cs"));
 
             if (dbContext == null)
             {
@@ -83,9 +84,10 @@ namespace Volo.Abp.Cli.ProjectModification
 
         protected virtual string FindTenantDbContextName(string dbMigrationsFolder)
         {
-            var tenantDbContext = Directory
-                .GetFiles(dbMigrationsFolder, "*TenantMigrationsDbContext.cs", SearchOption.AllDirectories)
-                .FirstOrDefault();
+            var tenantDbContext = Directory.GetFiles(dbMigrationsFolder, "*TenantMigrationsDbContext.cs", SearchOption.AllDirectories)
+                                      .FirstOrDefault() ??
+                                  Directory.GetFiles(dbMigrationsFolder, "*TenantDbContext.cs", SearchOption.AllDirectories)
+                                      .FirstOrDefault();
 
             if (tenantDbContext == null)
             {