diff --git a/src/System.DirectoryServices.AccountManagement/tests/PrincipalContextTests.cs b/src/System.DirectoryServices.AccountManagement/tests/PrincipalContextTests.cs
index 3f12128f7560..bf67a3c0591e 100644
--- a/src/System.DirectoryServices.AccountManagement/tests/PrincipalContextTests.cs
+++ b/src/System.DirectoryServices.AccountManagement/tests/PrincipalContextTests.cs
@@ -170,7 +170,11 @@ public void Ctor_InvalidContexType_ThrowsInvalidEnumArgumentException(ContextTyp
         [Fact]
         public void Ctor_DomainContextType_ThrowsPrincipalServerDownException()
         {
-            Assert.Throws<PrincipalServerDownException>(() => new PrincipalContext(ContextType.Domain));
+            if (Environment.MachineName.Equals(Environment.UserDomainName, StringComparison.OrdinalIgnoreCase))
+            {
+                // The machine is not connected to a domain. we expect PrincipalContext(ContextType.Domain) to throw
+                Assert.Throws<PrincipalServerDownException>(() => new PrincipalContext(ContextType.Domain));
+            }
         }
 
         [Fact]
diff --git a/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/SearchResults.cs b/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/SearchResults.cs
index 9edcb9389bc7..7c811207178e 100644
--- a/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/SearchResults.cs
+++ b/src/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/SearchResults.cs
@@ -72,10 +72,11 @@ public class SearchResultEntry
     {
         private DirectoryControl[] _resultControls = null;
 
-        internal SearchResultEntry(string dn) => DistinguishedName = dn;
+        internal SearchResultEntry(string dn) : this(dn, new SearchResultAttributeCollection()) {}
 
-        internal SearchResultEntry(string dn, SearchResultAttributeCollection attrs) : this(dn)
+        internal SearchResultEntry(string dn, SearchResultAttributeCollection attrs)
         {
+            DistinguishedName = dn;
             Attributes = attrs;
         }