diff --git a/sdks/python/apache_beam/runners/interactive/testing/integration/notebook_executor.py b/sdks/python/apache_beam/runners/interactive/testing/integration/notebook_executor.py
index 10517223630a..847873502eb2 100644
--- a/sdks/python/apache_beam/runners/interactive/testing/integration/notebook_executor.py
+++ b/sdks/python/apache_beam/runners/interactive/testing/integration/notebook_executor.py
@@ -82,7 +82,8 @@ def execute(self):
     for path in self._paths:
       with open(path, 'r') as nb_f:
         nb = nbformat.read(nb_f, as_version=4)
-        ep = ExecutePreprocessor(allow_errors=True, kernel_name='test')
+        ep = ExecutePreprocessor(
+            timeout=-1, allow_errors=True, kernel_name='test')
         ep.preprocess(nb, {'metadata': {'path': os.path.dirname(path)}})
 
       execution_id = obfuscate(path)
diff --git a/sdks/python/apache_beam/runners/interactive/testing/integration/tests/init_square_cube_test.py b/sdks/python/apache_beam/runners/interactive/testing/integration/tests/init_square_cube_test.py
index 95d94f4ef92b..5cd91848402d 100644
--- a/sdks/python/apache_beam/runners/interactive/testing/integration/tests/init_square_cube_test.py
+++ b/sdks/python/apache_beam/runners/interactive/testing/integration/tests/init_square_cube_test.py
@@ -22,9 +22,12 @@
 
 import unittest
 
+import pytest
+
 from apache_beam.runners.interactive.testing.integration.screen_diff import BaseTestCase
 
 
+@pytest.mark.timeout(300)
 class InitSquareCubeTest(BaseTestCase):
   def __init__(self, *args, **kwargs):
     kwargs['golden_size'] = (1024, 10000)
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index b68c6906d067..775f321e9440 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -206,7 +206,9 @@ def get_version():
     'facets-overview>=1.0.0,<2',
     'ipython>=5.8.0,<8',
     'ipykernel>=5.2.0,<6',
-    'jupyter-client>=6.1.11,<7',
+    # Skip version 6.1.13 due to
+    # https://github.com/jupyter/jupyter_client/issues/637
+    'jupyter-client>=6.1.11,<6.1.13',
     'timeloop>=1.0.2,<2',
 ]