diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestData.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestData.cs
new file mode 100644
index 0000000000..0392cc889d
--- /dev/null
+++ b/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestData.cs
@@ -0,0 +1,14 @@
+using System;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.IdentityServer
+{
+    public class AbpIdentityServerTestData : ISingletonDependency
+    {
+        public Guid Client1Id { get; } = Guid.NewGuid();
+
+        public Guid ApiResource1Id { get; } = Guid.NewGuid();
+
+        public Guid IdentityResource1Id { get; } = Guid.NewGuid();
+    }
+}
diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
index 472c23b7e2..f40bdfe965 100644
--- a/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
+++ b/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
@@ -14,14 +14,17 @@ namespace Volo.Abp.IdentityServer
         private readonly IClientRepository _clientRepository;
         private readonly IIdentityResourceRepository _identityResourceRepository;
         //private readonly IPersistentGrantRepository _persistentGrantRepository;
+        private readonly AbpIdentityServerTestData _testData;
 
         public AbpIdentityServerTestDataBuilder(
             IGuidGenerator guidGenerator,
             IApiResourceRepository apiResourceRepository,
             IClientRepository clientRepository,
-            IIdentityResourceRepository identityResourceRepository
+            IIdentityResourceRepository identityResourceRepository,
+            AbpIdentityServerTestData testData
             /*IPersistentGrantRepository persistentGrantRepository*/)
         {
+            _testData = testData;
             _guidGenerator = guidGenerator;
             _apiResourceRepository = apiResourceRepository;
             _clientRepository = clientRepository;
@@ -46,21 +49,21 @@ namespace Volo.Abp.IdentityServer
 
         private void AddIdentityResources()
         {
-            _identityResourceRepository.Insert(new IdentityResource(_guidGenerator.Create(), "NewIdentityResource1"));
+            _identityResourceRepository.Insert(new IdentityResource(_testData.IdentityResource1Id, "NewIdentityResource1"));
             _identityResourceRepository.Insert(new IdentityResource(_guidGenerator.Create(), "NewIdentityResource2"));
             _identityResourceRepository.Insert(new IdentityResource(_guidGenerator.Create(), "NewIdentityResource3"));
         }
 
         private void AddApiResources()
         {
-            _apiResourceRepository.Insert(new ApiResource(_guidGenerator.Create(), "NewApiResource1"));
+            _apiResourceRepository.Insert(new ApiResource(_testData.ApiResource1Id, "NewApiResource1"));
             _apiResourceRepository.Insert(new ApiResource(_guidGenerator.Create(), "NewApiResource2"));
             _apiResourceRepository.Insert(new ApiResource(_guidGenerator.Create(), "NewApiResource3"));
         }
 
         private void AddClients()
         {
-            _clientRepository.Insert(new Client(_guidGenerator.Create(), "ClientId1"));
+            _clientRepository.Insert(new Client(_testData.Client1Id, "ClientId1"));
             _clientRepository.Insert(new Client(_guidGenerator.Create(), "ClientId2"));
             _clientRepository.Insert(new Client(_guidGenerator.Create(), "ClientId3"));
         }