diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6569f1f8102..027c061cf28 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,8 +23,6 @@ jobs:
           # Release builds
           - os: macos-15
             config: "release"
-            # https://github.com/zeroc-ice/ice/issues/2061
-            test_flags: "--rfilter=csharp/Ice/adapterDeactivation"
           - os: ubuntu-24.04
             config: "release"
           - os: windows-2022
@@ -42,8 +40,7 @@ jobs:
           - os: macos-15
             config: "debug"
             build_flags: "OPTIMIZE=no"
-            # https://github.com/zeroc-ice/ice/issues/2061
-            test_flags: "--swift-config=debug --rfilter=csharp/Ice/adapterDeactivation"
+            test_flags: "--swift-config=debug"
           - os: ubuntu-24.04
             config: "debug"
             build_flags: "OPTIMIZE=no"
diff --git a/scripts/Util.py b/scripts/Util.py
index 5306555c4c7..2f77aa1f4c7 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -867,11 +867,12 @@ def getProps(self, process, current):
                     props["Ice.Override.Compress"] = "1"
                 if self.serialize:
                     props["Ice.ThreadPool.Server.Serialize"] = "1"
-                # JavaScript does not support the Ice.IPv6 property
+
                 if not isinstance(current.testsuite.getMapping(), JavaScriptMapping):
+                    # JavaScript does not support the IPv6 properties
                     props["Ice.IPv6"] = self.ipv6
-                if self.ipv6:
-                    props["Ice.PreferIPv6Address"] = True
+                    if self.ipv6:
+                        props["Ice.PreferIPv6Address"] = True
                 if self.mx:
                     props["Ice.Admin.Endpoints"] = (
                         'tcp -h "::1"' if self.ipv6 else "tcp -h 127.0.0.1"
diff --git a/scripts/tests/Ice/adapterDeactivation.py b/scripts/tests/Ice/adapterDeactivation.py
index e99077122f6..e2bd7a8e1b9 100644
--- a/scripts/tests/Ice/adapterDeactivation.py
+++ b/scripts/tests/Ice/adapterDeactivation.py
@@ -3,7 +3,12 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 
-from Util import TestSuite
+from Util import CSharpMapping, Darwin, TestSuite, platform, Mapping
 
+options = {}
+# Disable IPv6 for .NET on macOS until https://github.com/dotnet/runtime/pull/108334 is merged in .NET 8
+# See https://github.com/zeroc-ice/ice/issues/2061
+if (isinstance(Mapping.getByPath(__name__), CSharpMapping) and isinstance(platform, Darwin)):
+    options = {"ipv6": [False]}
 
-TestSuite(__name__, multihost=False)
+TestSuite(__name__, multihost=False, options=options)