diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/Entity.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/Entity.cs
index 007442f781..685df3a8be 100644
--- a/src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/Entity.cs
+++ b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/Entity.cs
@@ -1,4 +1,6 @@
-using System.Reflection;
+using System;
+using System.Reflection;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.Domain.Entities
 {
@@ -47,6 +49,13 @@ namespace Volo.Abp.Domain.Entities
                 return false;
             }
 
+            //Different tenants may have an entity with same Id.
+            if (this is IMultiTenant && other is IMultiTenant &&
+                this.As<IMultiTenant>().TenantId != other.As<IMultiTenant>().TenantId)
+            {
+                return false;
+            }
+
             return Id.Equals(other.Id);
         }
 
diff --git a/test/Volo.Abp.MultiTenancy.Application.Tests/Volo/Abp/MultiTenancy/AbpIdentityApplicationTestBase.cs b/test/Volo.Abp.MultiTenancy.Application.Tests/Volo/Abp/MultiTenancy/AbpMultiTenancyApplicationTestBase.cs
similarity index 86%
rename from test/Volo.Abp.MultiTenancy.Application.Tests/Volo/Abp/MultiTenancy/AbpIdentityApplicationTestBase.cs
rename to test/Volo.Abp.MultiTenancy.Application.Tests/Volo/Abp/MultiTenancy/AbpMultiTenancyApplicationTestBase.cs
index d97ad8378d..989d2932c7 100644
--- a/test/Volo.Abp.MultiTenancy.Application.Tests/Volo/Abp/MultiTenancy/AbpIdentityApplicationTestBase.cs
+++ b/test/Volo.Abp.MultiTenancy.Application.Tests/Volo/Abp/MultiTenancy/AbpMultiTenancyApplicationTestBase.cs
@@ -3,7 +3,7 @@ using Volo.Abp.MultiTenancy.EntityFrameworkCore;
 
 namespace Volo.Abp.MultiTenancy
 {
-    public class AbpMultiTenancyApplicationTestBase : AbpIntegratedTest<AbpMultiTenancyApplicationTestModule>
+    public abstract class AbpMultiTenancyApplicationTestBase : AbpIntegratedTest<AbpMultiTenancyApplicationTestModule>
     {
         protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
         {