diff --git a/src/Opc.Ua.Core/Schema/SecuredApplicationHelpers.cs b/src/Opc.Ua.Core/Schema/SecuredApplicationHelpers.cs
index 21aa8f0c68..2807bf4497 100644
--- a/src/Opc.Ua.Core/Schema/SecuredApplicationHelpers.cs
+++ b/src/Opc.Ua.Core/Schema/SecuredApplicationHelpers.cs
@@ -393,10 +393,10 @@ namespace Opc.Ua.Security
                     logger.SecuredApplicationHelpersLogMessage3(policyUri);
                     result = 4;
                     break;
-                case SecurityPolicies.Basic256Sha256:
+                case SecurityPolicies.Aes128_Sha256_RsaOaep:
                     result = 6;
                     break;
-                case SecurityPolicies.Aes128_Sha256_RsaOaep:
+                case SecurityPolicies.Basic256Sha256:
                     result = 8;
                     break;
                 case SecurityPolicies.Aes256_Sha256_RsaPss:
diff --git a/tests/Opc.Ua.Core.Tests/Schema/SecuredApplicationHelpersTests.cs b/tests/Opc.Ua.Core.Tests/Schema/SecuredApplicationHelpersTests.cs
index 42389ff8cc..d67eff43c9 100644
--- a/tests/Opc.Ua.Core.Tests/Schema/SecuredApplicationHelpersTests.cs
+++ b/tests/Opc.Ua.Core.Tests/Schema/SecuredApplicationHelpersTests.cs
@@ -94,15 +94,15 @@ namespace Opc.Ua.Core.Tests.Schema
             Assert.That(
                 SecuredApplication.CalculateSecurityLevel(
                     MessageSecurityMode.Sign,
-                    SecurityPolicies.Basic256Sha256, logger),
+                    SecurityPolicies.Aes128_Sha256_RsaOaep, logger),
                 Is.LessThan(SecuredApplication.CalculateSecurityLevel(
                     MessageSecurityMode.Sign,
-                    SecurityPolicies.Aes128_Sha256_RsaOaep, logger)));
+                    SecurityPolicies.Basic256Sha256, logger)));
 
             Assert.That(
                 SecuredApplication.CalculateSecurityLevel(
                     MessageSecurityMode.Sign,
-                    SecurityPolicies.Aes128_Sha256_RsaOaep,
+                    SecurityPolicies.Basic256Sha256,
                     logger
                 ),
                 Is.LessThan(SecuredApplication.CalculateSecurityLevel(
diff --git a/tests/Opc.Ua.Subscriptions.Classic.Tests/SubscriptionTest.cs b/tests/Opc.Ua.Subscriptions.Classic.Tests/SubscriptionTest.cs
index e6ed7974ab..11be6f2052 100644
--- a/tests/Opc.Ua.Subscriptions.Classic.Tests/SubscriptionTest.cs
+++ b/tests/Opc.Ua.Subscriptions.Classic.Tests/SubscriptionTest.cs
@@ -450,6 +450,8 @@ namespace Opc.Ua.Subscriptions.Classic.Tests
             const int monitoredItemsPerSubscription = 50;
             const int subscriptions = 50;
             const int maxServerPublishRequest = 20;
+            // Server revises the requested publishing interval of 0 to 100 ms
+            const int samplingInterval = 100;
 
             for (int i = 0; i < subscriptions; i++)
             {
@@ -473,7 +475,9 @@ namespace Opc.Ua.Subscriptions.Classic.Tests
                         new TestableMonitoredItem(subscription.DefaultItem)
                         {
                             StartNodeId = nextNode,
-                            SamplingInterval = 0
+                            // Sample at the revised publishing interval to keep
+                            // the server load of 2500 items bounded on CI hosts
+                            SamplingInterval = samplingInterval
                         });
                 }
                 var dict = list.ToDictionary(item => item.ClientHandle, _ => DateTime.MinValue);