diff --git a/python-httpx.changes b/python-httpx.changes
index 32b2ead..c50d8ad 100644
--- a/python-httpx.changes
+++ b/python-httpx.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 15 13:25:11 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
+
+- Use libalternatives instead of update-alternatives, bsc#1235784 
+- don't run tests in strict async mode, upstream doesn't either
+- disable flaky test
+
 -------------------------------------------------------------------
 Sat Dec  7 13:27:08 UTC 2024 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-httpx.spec b/python-httpx.spec
index 96f09b1..33291c5 100644
--- a/python-httpx.spec
+++ b/python-httpx.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-httpx
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,12 @@
 %bcond_with test
 %endif
 
+%if 0%{?suse_version} > 1500
+%bcond_without libalternatives
+%else
+%bcond_with libalternatives
+%endif
+
 %{?sle15_python_module_pythons}
 Name:           python-httpx%{psuffix}
 Version:        0.28.1
@@ -49,8 +55,13 @@ Recommends:     python-Pygments >= 2
 Recommends:     python-click >= 8
 Recommends:     python-h2 >= 3.0
 Recommends:     python-rich >= 10
+%if %{with libalternatives}
+Requires:       alts
+BuildRequires:  alts
+%else
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
+%endif
 BuildArch:      noarch
 # SECTION test requirements
 %if %{with test}
@@ -95,9 +106,15 @@ Python HTTP client with async support.
 donttest="network"
 # no socksio
 donttest="$donttest or socks"
-%pytest -vv -k "not ($donttest)" --asyncio-mode=strict
+# test is hardware dependent, fails on OBS
+donttest="$donttest or test_write_timeout[trio]"
+%pytest -vv -k "not ($donttest)"
 %endif
 
+%pre
+# If libalternatives is used: Removing old update-alternatives entries.
+%python_libalternatives_reset_alternative httpx
+
 %post
 %python_install_alternative httpx