diff --git a/jupyter_client/asynchronous/client.py b/jupyter_client/asynchronous/client.py
index 11873416..cde8ecaf 100644
--- a/jupyter_client/asynchronous/client.py
+++ b/jupyter_client/asynchronous/client.py
@@ -33,7 +33,7 @@ class AsyncKernelClient(KernelClient):
     raising :exc:`queue.Empty` if no message arrives within ``timeout`` seconds.
     """
 
-    context = Instance(zmq.asyncio.Context)
+    context = Instance(zmq.asyncio.Context)  # type:ignore[arg-type]
 
     def _context_default(self) -> zmq.asyncio.Context:
         self._created_context = True
diff --git a/jupyter_client/channels.py b/jupyter_client/channels.py
index c645b134..465dccdf 100644
--- a/jupyter_client/channels.py
+++ b/jupyter_client/channels.py
@@ -223,9 +223,8 @@ def _recv(self, **kwargs: t.Any) -> t.Dict[str, t.Any]:
     def get_msg(self, timeout: t.Optional[float] = None) -> t.Dict[str, t.Any]:
         """Gets a message if there is one that is ready."""
         assert self.socket is not None
-        if timeout is not None:
-            timeout *= 1000  # seconds to ms
-        ready = self.socket.poll(timeout)
+        timeout_ms = None if timeout is None else int(timeout * 1000)  # seconds to ms
+        ready = self.socket.poll(timeout_ms)
         if ready:
             res = self._recv()
             return res
@@ -305,9 +304,8 @@ async def get_msg(  # type:ignore[override]
     ) -> t.Dict[str, t.Any]:
         """Gets a message if there is one that is ready."""
         assert self.socket is not None
-        if timeout is not None:
-            timeout *= 1000  # seconds to ms
-        ready = await self.socket.poll(timeout)
+        timeout_ms = None if timeout is None else int(timeout * 1000)  # seconds to ms
+        ready = await self.socket.poll(timeout_ms)
         if ready:
             res = await self._recv()
             return res
diff --git a/jupyter_client/client.py b/jupyter_client/client.py
index aa353ac2..851a2345 100644
--- a/jupyter_client/client.py
+++ b/jupyter_client/client.py
@@ -530,7 +530,7 @@ async def _async_execute_interactive(
         else:
             timeout_ms = None
 
-        poller = zmq.Poller()
+        poller = zmq.asyncio.Poller()
         iopub_socket = self.iopub_channel.socket
         poller.register(iopub_socket, zmq.POLLIN)
         if allow_stdin:
@@ -544,7 +544,7 @@ async def _async_execute_interactive(
             if timeout is not None:
                 timeout = max(0, deadline - time.monotonic())
                 timeout_ms = int(1000 * timeout)
-            events = dict(poller.poll(timeout_ms))
+            events = dict(await poller.poll(timeout_ms))
             if not events:
                 emsg = "Timeout waiting for output"
                 raise TimeoutError(emsg)
diff --git a/pyproject.toml b/pyproject.toml
index c2be8205..8a0ea4f4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,7 +51,7 @@ test = [
     "mypy",
     "paramiko; sys_platform == 'win32'",
     "pre-commit",
-    "pytest",
+    "pytest<8.2.0",
     "pytest-jupyter[client]>=0.4.1",
     "pytest-cov",
     "pytest-timeout",