diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..223c637
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,4 @@
+<multibuild>
+  <package>test</package>
+</multibuild>
+
diff --git a/pytest-asyncio-045.patch b/pytest-asyncio-045.patch
deleted file mode 100644
index 5e57235..0000000
--- a/pytest-asyncio-045.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: python-redis/redis-5.2.1/tests/test_asyncio/test_scripting.py
-===================================================================
---- python-redis.orig/redis-5.2.1/tests/test_asyncio/test_scripting.py
-+++ python-redis/redis-5.2.1/tests/test_asyncio/test_scripting.py
-@@ -28,14 +28,14 @@ class TestScripting:
-         yield redis
-         await redis.script_flush()
- 
--    @pytest.mark.asyncio(forbid_global_loop=True)
-+    @pytest.mark.asyncio()
-     async def test_eval(self, r):
-         await r.flushdb()
-         await r.set("a", 2)
-         # 2 * 3 == 6
-         assert await r.eval(multiply_script, 1, "a", 3) == 6
- 
--    @pytest.mark.asyncio(forbid_global_loop=True)
-+    @pytest.mark.asyncio()
-     @skip_if_server_version_lt("6.2.0")
-     async def test_script_flush(self, r):
-         await r.set("a", 2)
-@@ -55,14 +55,14 @@ class TestScripting:
-             await r.script_load(multiply_script)
-             await r.script_flush("NOTREAL")
- 
--    @pytest.mark.asyncio(forbid_global_loop=True)
-+    @pytest.mark.asyncio()
-     async def test_evalsha(self, r):
-         await r.set("a", 2)
-         sha = await r.script_load(multiply_script)
-         # 2 * 3 == 6
-         assert await r.evalsha(sha, 1, "a", 3) == 6
- 
--    @pytest.mark.asyncio(forbid_global_loop=True)
-+    @pytest.mark.asyncio()
-     async def test_evalsha_script_not_loaded(self, r):
-         await r.set("a", 2)
-         sha = await r.script_load(multiply_script)
-@@ -71,7 +71,7 @@ class TestScripting:
-         with pytest.raises(exceptions.NoScriptError):
-             await r.evalsha(sha, 1, "a", 3)
- 
--    @pytest.mark.asyncio(forbid_global_loop=True)
-+    @pytest.mark.asyncio()
-     async def test_script_loading(self, r):
-         # get the sha, then clear the cache
-         sha = await r.script_load(multiply_script)
-@@ -80,7 +80,7 @@ class TestScripting:
-         await r.script_load(multiply_script)
-         assert await r.script_exists(sha) == [True]
- 
--    @pytest.mark.asyncio(forbid_global_loop=True)
-+    @pytest.mark.asyncio()
-     async def test_script_object(self, r):
-         await r.script_flush()
-         await r.set("a", 2)
-@@ -97,7 +97,7 @@ class TestScripting:
-         # Test first evalsha block
-         assert await multiply(keys=["a"], args=[3]) == 6
- 
--    @pytest.mark.asyncio(forbid_global_loop=True)
-+    @pytest.mark.asyncio()
-     async def test_script_object_in_pipeline(self, r):
-         await r.script_flush()
-         multiply = r.register_script(multiply_script)
-@@ -127,7 +127,7 @@ class TestScripting:
-         assert await pipe.execute() == [True, b"2", 6]
-         assert await r.script_exists(multiply.sha) == [True]
- 
--    @pytest.mark.asyncio(forbid_global_loop=True)
-+    @pytest.mark.asyncio()
-     async def test_eval_msgpack_pipeline_error_in_lua(self, r):
-         msgpack_hello = r.register_script(msgpack_hello_script)
-         assert msgpack_hello.sha
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 0c3feca..0000000
--- a/pytest.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[pytest]
-addopts = -s
-markers =
-    redismod: run only the redis module tests
-    graph: run only the redisgraph tests
-    pipeline: pipeline tests
-    onlycluster: marks tests to be run only with cluster mode redis
-    onlynoncluster: marks tests to be run only with standalone redis
-    ssl: marker for only the ssl tests
-    asyncio: marker for async tests
-    replica: replica tests
-    experimental: run only experimental tests
-asyncio_mode = auto
-timeout = 30
-filterwarnings =
-    always
-    ignore:RedisGraph support is deprecated as of Redis Stack 7.2:DeprecationWarning
-    # Ignore a coverage warning when COVERAGE_CORE=sysmon for Pythons < 3.12.
-    ignore:sys.monitoring isn't available:coverage.exceptions.CoverageWarning
diff --git a/python-redis.changes b/python-redis.changes
index 5e18cde..d25e656 100644
--- a/python-redis.changes
+++ b/python-redis.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Thu Jun 12 10:24:11 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Remove not needed pytest.ini source file.
+
+-------------------------------------------------------------------
+Tue Jun 10 16:44:41 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Update to 6.2.0:
+  * https://github.com/redis/redis-py/releases/tag/v6.2.0
+  * https://github.com/redis/redis-py/releases/tag/v6.1.0
+  * https://github.com/redis/redis-py/releases/tag/v6.0.0
+  * https://github.com/redis/redis-py/releases/tag/v5.3.0
+- Drop pytest-asyncio-045.patch
+  * Fixed upstream
+- Add remove-mock.patch
+  * Use built-in unittest.mock
+- Don't remove test_graph.py
+  * The test was dropped upstream
+- Add new python-redis-entraid and pytest-mock dependencies for tests
+- Add new hatchling build requirement
+  * Remove setuptools which is no longer needed
+- Move test suite to separate flavor to avoid dependency cycle with
+  python-redis-entraid
+  * Add _multibuild
+  * Move some dependencies that were only needed for tests to the new
+    flavor
+- Update skipped test list due to gh#python/cpython#70654
+  * Skip test_re_auth_pub_sub_in_resp3
+  * Skip test_do_not_re_auth_pub_sub_in_resp2
+
 -------------------------------------------------------------------
 Thu Feb 13 10:59:14 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
 
diff --git a/python-redis.spec b/python-redis.spec
index 14a5b7a..eaca72e 100644
--- a/python-redis.spec
+++ b/python-redis.spec
@@ -16,34 +16,44 @@
 #
 
 
-%bcond_without testing
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%endif
+
+%if "%{flavor}" == ""
+%define psuffix %{nil}
+%bcond_with test
+%endif
 
 %{?sle15_python_module_pythons}
-Name:           python-redis
-Version:        5.2.1
+Name:           python-redis%{psuffix}
+Version:        6.2.0
 Release:        0
 Summary:        Python client for Redis key-value store
 License:        MIT
 URL:            https://github.com/redis/redis-py
 Source0:        https://files.pythonhosted.org/packages/source/r/redis/redis-%{version}.tar.gz
-Source1:        https://github.com/redis/redis-py/raw/refs/tags/v%{version}/pytest.ini
 Patch0:         increase-test-timeout.patch
-# PATCH-FIX-OPENSUSE pytest-asyncio-045.patch
-Patch1:         pytest-asyncio-045.patch
+Patch1:         remove-mock.patch
 BuildRequires:  %{python_module async-timeout >= 4.0.2 if %python-base < 3.11.3}
 BuildRequires:  %{python_module base >= 3.7}
+BuildRequires:  %{python_module hatchling}
 BuildRequires:  %{python_module numpy}
 BuildRequires:  %{python_module packaging}
 BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module pytest-asyncio}
-BuildRequires:  %{python_module pytest-timeout}
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  psmisc
 BuildRequires:  python-rpm-macros
-%if %{with testing}
+%if %{with test}
+BuildRequires:  %{python_module pytest-asyncio}
+BuildRequires:  %{python_module pytest-cov}
+BuildRequires:  %{python_module pytest-mock}
+BuildRequires:  %{python_module pytest-timeout}
+BuildRequires:  %{python_module redis = %{version}}
+BuildRequires:  %{python_module redis-entraid}
 BuildRequires:  redis
 %endif
 Requires:       (python-async-timeout >= 4.0.2 if python-base < 3.11.3)
@@ -57,32 +67,33 @@ The Python interface to the Redis key-value store.
 
 %prep
 %autosetup -N -n redis-%{version}
-# pytest.ini for pytest markers but without coverage
-sed /coverage/d  %SOURCE1 > pytest.ini
 %ifarch s390x
 %patch -P 0 -p1
 %endif
-%patch -P 1 -p2
+%patch -P 1 -p1
 
 # These tests pass locally but fail in obs with different
 # environment, like ALP build...
 rm tests/test_commands.py*
 rm tests/test_asyncio/test_commands.py
-# The openSUSE redis json, bloom, ts and
-# graph are missing in the repos
+# The openSUSE redis json, bloom, ts
+# are missing in the repos
 rm tests/test_bloom.py
-rm tests/test_graph.py
 rm tests/test_json.py
 rm tests/test_timeseries.py
 
+%if %{without test}
 %build
 %pyproject_wheel
+%endif
 
+%if %{without test}
 %install
 %pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
-%if %{with testing}
+%if %{with test}
 %check
 # upstream's tox testsuite starts several servers in docker containers listening on different ports.
 # We just start two of them locally
@@ -106,15 +117,19 @@ sleep 2
 donttest="test_geopos or test_georadius"
 # gh#redis/redis-py#2554
 donttest="$donttest or test_xautoclaim"
+# gh#python/cpython#70654 -- Fix only present in python313 so disable the tests
+donttest+=" or test_re_auth_pub_sub_in_resp3 or test_do_not_re_auth_pub_sub_in_resp2"
 # gh#redis/redis-py#2679
 donttest+=" or test_acl_getuser_setuser or test_acl_log"
 %pytest -m 'not (onlycluster or redismod or ssl or graph)' -k "not ($donttest)" --ignore tests/test_ssl.py --ignore tests/test_asyncio/test_cluster.py --redis-url=redis://localhost:6379/
 %endif
 
+%if %{without test}
 %files %{python_files}
 %license LICENSE
 %doc README.md
 %{python_sitelib}/redis/
 %{python_sitelib}/redis-%{version}.dist-info
+%endif
 
 %changelog
diff --git a/redis-5.2.1.tar.gz b/redis-5.2.1.tar.gz
deleted file mode 100644
index 6ae2d37..0000000
--- a/redis-5.2.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16f2e22dff21d5125e8481515e386711a34cbec50f0e44413dd7d9c060a54e0f
-size 4608355
diff --git a/redis-6.2.0.tar.gz b/redis-6.2.0.tar.gz
new file mode 100644
index 0000000..42876cf
--- /dev/null
+++ b/redis-6.2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e821f129b75dde6cb99dd35e5c76e8c49512a5a0d8dfdc560b2fbd44b85ca977
+size 4639129
diff --git a/remove-mock.patch b/remove-mock.patch
new file mode 100644
index 0000000..24f4d3f
--- /dev/null
+++ b/remove-mock.patch
@@ -0,0 +1,26 @@
+Index: b/tests/test_asyncio/test_credentials.py
+===================================================================
+--- a/tests/test_asyncio/test_credentials.py
++++ b/tests/test_asyncio/test_credentials.py
+@@ -8,7 +8,7 @@ from typing import Optional, Tuple, Unio
+ import pytest
+ import pytest_asyncio
+ import redis
+-from mock.mock import Mock, call
++from unittest.mock import Mock, call
+ from redis import AuthenticationError, DataError, RedisError, ResponseError
+ from redis.asyncio import Connection, ConnectionPool, Redis
+ from redis.asyncio.retry import Retry
+Index: b/tests/test_credentials.py
+===================================================================
+--- a/tests/test_credentials.py
++++ b/tests/test_credentials.py
+@@ -7,7 +7,7 @@ from typing import Optional, Tuple, Unio
+ 
+ import pytest
+ import redis
+-from mock.mock import Mock, call
++from unittest.mock import Mock, call
+ from redis import AuthenticationError, DataError, Redis, ResponseError
+ from redis.auth.err import RequestTokenErr
+ from redis.backoff import NoBackoff