diff --git a/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDb_Repository_Tests.cs b/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDb_Repository_Tests.cs
index b62ac78bbc..2fc5a853fa 100644
--- a/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDb_Repository_Tests.cs
+++ b/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDb_Repository_Tests.cs
@@ -12,10 +12,12 @@ namespace Volo.Abp.MongoDB
     public class MongoDb_Repository_Tests : MongoDbTestBase
     {
         private readonly IRepository<Person, Guid> _personRepository;
+        private readonly ICityRepository _cityRepository;
 
         public MongoDb_Repository_Tests()
         {
             _personRepository = GetRequiredService<IRepository<Person, Guid>>();
+            _cityRepository = GetRequiredService<ICityRepository>();
         }
 
         [Fact]
@@ -80,5 +82,13 @@ namespace Volo.Abp.MongoDB
             person.Phones.Count.ShouldBe(1);
             person.Phones.Any(p => p.PersonId == person.Id && p.Number == "1234567890").ShouldBeTrue();
         }
+
+        [Fact]
+        public async Task Custom_Repository_Method()
+        {
+            var city = await _cityRepository.FindByNameAsync("Istanbul");
+            city.ShouldNotBeNull();
+            city.Name.ShouldBe("Istanbul");
+        }
     }
 }
diff --git a/test/Volo.Abp.MongoDB.Tests/Volo/Abp/TestApp/MongoDb/CityRepository.cs b/test/Volo.Abp.MongoDB.Tests/Volo/Abp/TestApp/MongoDb/CityRepository.cs
index 2d6e40e64a..0d212dc4b7 100644
--- a/test/Volo.Abp.MongoDB.Tests/Volo/Abp/TestApp/MongoDb/CityRepository.cs
+++ b/test/Volo.Abp.MongoDB.Tests/Volo/Abp/TestApp/MongoDb/CityRepository.cs
@@ -7,7 +7,7 @@ using Volo.Abp.TestApp.Domain;
 
 namespace Volo.Abp.TestApp.MongoDb
 {
-    public class CityRepository : MongoDbRepository<ITestAppMongoDbContext, City, Guid>,ICityRepository
+    public class CityRepository : MongoDbRepository<ITestAppMongoDbContext, City, Guid>, ICityRepository
     {
         public CityRepository(IMongoDatabaseProvider<ITestAppMongoDbContext> databaseProvider)
             : base(databaseProvider)
diff --git a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/ICityRepository.cs b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/ICityRepository.cs
index c0c2596aa8..8c3387424f 100644
--- a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/ICityRepository.cs
+++ b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/ICityRepository.cs
@@ -1,13 +1,11 @@
 using System;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using Volo.Abp.Domain.Repositories;
 
 namespace Volo.Abp.TestApp.Domain
 {
     public interface ICityRepository : IBasicRepository<City, Guid>
     {
-        [CanBeNull]
         Task<City> FindByNameAsync(string name);
     }
 }
diff --git a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
index cb907e6fcf..ca9cc5761d 100644
--- a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
+++ b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
@@ -37,11 +37,11 @@ namespace Volo.Abp.TestApp
             _cityRepository.Insert(new City(Guid.NewGuid(), "Istanbul"));
             _cityRepository.Insert(new City(Guid.NewGuid(), "Paris"));
             _cityRepository.Insert(new City(Guid.NewGuid(), "Washington"));
+            _cityRepository.Insert(new City(Guid.NewGuid(), "Sao Paulo"));
             _cityRepository.Insert(new City(Guid.NewGuid(), "Berlin"));
             _cityRepository.Insert(new City(Guid.NewGuid(), "Amsterdam"));
             _cityRepository.Insert(new City(Guid.NewGuid(), "Beijing"));
             _cityRepository.Insert(new City(Guid.NewGuid(), "Rome"));
-            _cityRepository.Insert(new City(Guid.NewGuid(), "Sao Paulo"));
         }
 
         private void AddPeople()