diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 769ff7a..af6f8df 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,6 +10,7 @@ jobs:
   tests:
     name: Python ${{ matrix.python-version }}
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 68c9993..aa4ea53 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+UNRELEASED
+----------
+
+* Pinned redis-py version to 4.3.5 in order to avoid difficult to diagnose
+  issues occurring with redis-py 4.4+ (to 4.5.2 currently).
+
+
 4.0.0 (2022-10-07)
 ------------------
 
diff --git a/setup.py b/setup.py
index 3886521..cffb682 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@
     include_package_data=True,
     python_requires=">=3.7",
     install_requires=[
-        "redis>=4.2.0",
+        "redis==4.3.5",
         "msgpack~=1.0",
         "asgiref>=3.2.10,<4",
         "channels",
diff --git a/tests/test_pubsub.py b/tests/test_pubsub.py
index 15f1e4b..78ad080 100644
--- a/tests/test_pubsub.py
+++ b/tests/test_pubsub.py
@@ -19,7 +19,8 @@ async def channel_layer():
     """
     channel_layer = RedisPubSubChannelLayer(hosts=TEST_HOSTS)
     yield channel_layer
-    await channel_layer.flush()
+    async with async_timeout.timeout(1):
+        await channel_layer.flush()
 
 
 @pytest.fixture()
diff --git a/tests/test_pubsub_sentinel.py b/tests/test_pubsub_sentinel.py
index 300b106..049e39b 100644
--- a/tests/test_pubsub_sentinel.py
+++ b/tests/test_pubsub_sentinel.py
@@ -25,7 +25,8 @@ async def channel_layer():
     """
     channel_layer = RedisPubSubChannelLayer(hosts=TEST_HOSTS)
     yield channel_layer
-    await channel_layer.flush()
+    async with async_timeout.timeout(1):
+        await channel_layer.flush()
 
 
 @pytest.mark.asyncio