diff --git a/modules/EasyAbp.EShop.Baskets/test/EasyAbp.EShop.Baskets.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/modules/EasyAbp.EShop.Baskets/test/EasyAbp.EShop.Baskets.TestBase/Security/FakeCurrentPrincipalAccessor.cs
index e142a130..7b79d1a7 100644
--- a/modules/EasyAbp.EShop.Baskets/test/EasyAbp.EShop.Baskets.TestBase/Security/FakeCurrentPrincipalAccessor.cs
+++ b/modules/EasyAbp.EShop.Baskets/test/EasyAbp.EShop.Baskets.TestBase/Security/FakeCurrentPrincipalAccessor.cs
@@ -6,9 +6,13 @@ using Volo.Abp.Security.Claims;
 namespace EasyAbp.EShop.Baskets.Security
 {
     [Dependency(ReplaceServices = true)]
-    public class FakeCurrentPrincipalAccessor : ICurrentPrincipalAccessor, ISingletonDependency
+    public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
     {
-        public ClaimsPrincipal Principal => GetPrincipal();
+        public override ClaimsPrincipal GetClaimsPrincipal()
+        {
+            return GetPrincipal();
+        }
+
         private ClaimsPrincipal _principal;
 
         private ClaimsPrincipal GetPrincipal()
diff --git a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/Security/FakeCurrentPrincipalAccessor.cs
index 830c473e..a174504e 100644
--- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/Security/FakeCurrentPrincipalAccessor.cs
+++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/Security/FakeCurrentPrincipalAccessor.cs
@@ -6,9 +6,13 @@ using Volo.Abp.Security.Claims;
 namespace EasyAbp.EShop.Orders.Security
 {
     [Dependency(ReplaceServices = true)]
-    public class FakeCurrentPrincipalAccessor : ICurrentPrincipalAccessor, ISingletonDependency
+    public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
     {
-        public ClaimsPrincipal Principal => GetPrincipal();
+        public override ClaimsPrincipal GetClaimsPrincipal()
+        {
+            return GetPrincipal();
+        }
+
         private ClaimsPrincipal _principal;
 
         private ClaimsPrincipal GetPrincipal()
diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/Security/FakeCurrentPrincipalAccessor.cs
index 155021f0..3187902e 100644
--- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/Security/FakeCurrentPrincipalAccessor.cs
+++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/Security/FakeCurrentPrincipalAccessor.cs
@@ -6,9 +6,13 @@ using Volo.Abp.Security.Claims;
 namespace EasyAbp.EShop.Payments.Security
 {
     [Dependency(ReplaceServices = true)]
-    public class FakeCurrentPrincipalAccessor : ICurrentPrincipalAccessor, ISingletonDependency
+    public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
     {
-        public ClaimsPrincipal Principal => GetPrincipal();
+        public override ClaimsPrincipal GetClaimsPrincipal()
+        {
+            return GetPrincipal();
+        }
+
         private ClaimsPrincipal _principal;
 
         private ClaimsPrincipal GetPrincipal()
diff --git a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/Security/FakeCurrentPrincipalAccessor.cs
index 524de9a8..92b47654 100644
--- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/Security/FakeCurrentPrincipalAccessor.cs
+++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/Security/FakeCurrentPrincipalAccessor.cs
@@ -6,9 +6,13 @@ using Volo.Abp.Security.Claims;
 namespace EasyAbp.EShop.Products.Security
 {
     [Dependency(ReplaceServices = true)]
-    public class FakeCurrentPrincipalAccessor : ICurrentPrincipalAccessor, ISingletonDependency
+    public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
     {
-        public ClaimsPrincipal Principal => GetPrincipal();
+        public override ClaimsPrincipal GetClaimsPrincipal()
+        {
+            return GetPrincipal();
+        }
+
         private ClaimsPrincipal _principal;
 
         private ClaimsPrincipal GetPrincipal()
diff --git a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/Security/FakeCurrentPrincipalAccessor.cs
index a4349439..2917f6dc 100644
--- a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/Security/FakeCurrentPrincipalAccessor.cs
+++ b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/Security/FakeCurrentPrincipalAccessor.cs
@@ -6,9 +6,13 @@ using Volo.Abp.Security.Claims;
 namespace EasyAbp.EShop.Stores.Security
 {
     [Dependency(ReplaceServices = true)]
-    public class FakeCurrentPrincipalAccessor : ICurrentPrincipalAccessor, ISingletonDependency
+    public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
     {
-        public ClaimsPrincipal Principal => GetPrincipal();
+        public override ClaimsPrincipal GetClaimsPrincipal()
+        {
+            return GetPrincipal();
+        }
+
         private ClaimsPrincipal _principal;
 
         private ClaimsPrincipal GetPrincipal()
diff --git a/samples/EasyMall/aspnet-core/test/EasyMall.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/samples/EasyMall/aspnet-core/test/EasyMall.TestBase/Security/FakeCurrentPrincipalAccessor.cs
index 5e337d12..7ad95486 100644
--- a/samples/EasyMall/aspnet-core/test/EasyMall.TestBase/Security/FakeCurrentPrincipalAccessor.cs
+++ b/samples/EasyMall/aspnet-core/test/EasyMall.TestBase/Security/FakeCurrentPrincipalAccessor.cs
@@ -6,9 +6,13 @@ using Volo.Abp.Security.Claims;
 namespace EasyMall.Security
 {
     [Dependency(ReplaceServices = true)]
-    public class FakeCurrentPrincipalAccessor : ICurrentPrincipalAccessor, ISingletonDependency
+    public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
     {
-        public ClaimsPrincipal Principal => GetPrincipal();
+        public override ClaimsPrincipal GetClaimsPrincipal()
+        {
+            return GetPrincipal();
+        }
+
         private ClaimsPrincipal _principal;
 
         private ClaimsPrincipal GetPrincipal()