diff --git a/python-jupyter-client.changes b/python-jupyter-client.changes
index a311c48..91d5a00 100644
--- a/python-jupyter-client.changes
+++ b/python-jupyter-client.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Aug 12 10:13:22 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- remove the ringdisabled conditional: ipykernel5 will be in Ring1
+
+-------------------------------------------------------------------
+Wed Aug 11 09:38:35 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Disable testing the kernelmanager in the python36 flavor in
+  lettered staging so that we don't need python-ipykernel5 in Ring1
+- Work around conflict for jupyter-ipykernel due to dangling
+  python36-ipykernel package until it gets removed from Factory
+
 -------------------------------------------------------------------
 Mon Jun 28 10:11:19 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-jupyter-client.spec b/python-jupyter-client.spec
index 6c16769..18d323d 100644
--- a/python-jupyter-client.spec
+++ b/python-jupyter-client.spec
@@ -58,6 +58,9 @@ BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module traitlets}
 # flaky is not an upstream dep, but for obs flakyness of parallel kernel test
 BuildRequires:  %{python_module flaky}
+# Workaround until python-ipykernel 6 lands in Factory and openSUSE:Tumbleweed/dod, removing python36-ipykernel
+# (see https://lists.opensuse.org/archives/list/packaging@lists.opensuse.org/message/742CEMJ57YWNVESAPWJ6HHZBZZ4RMJFP )
+#!BuildIgnore:  python36-ipykernel:jupyter-ipykernel
 %endif
 %python_subpackages
 
@@ -107,7 +110,7 @@ sed -i -E 's/(^\s+)break/\1time.sleep(1)\n\1break/' \
 %if %{with test}
 %check
 pushd jupyter_client/tests
-%pytest --force-flaky --max-runs=2 --no-success-flaky-report
+%pytest --force-flaky --max-runs=3 --no-success-flaky-report
 popd
 %endif