diff --git a/python-flasgger.changes b/python-flasgger.changes
index cc1ed80..3b431d2 100644
--- a/python-flasgger.changes
+++ b/python-flasgger.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 13 06:49:59 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch support-click-8.2.patch:
+  * Support click 8.2+.
+
 -------------------------------------------------------------------
 Thu Jan 23 03:51:17 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
 
diff --git a/python-flasgger.spec b/python-flasgger.spec
index 07539e8..50692d6 100644
--- a/python-flasgger.spec
+++ b/python-flasgger.spec
@@ -35,6 +35,8 @@ URL:            https://github.com/flasgger/flasgger/
 Source:         https://files.pythonhosted.org/packages/source/f/flasgger/flasgger-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM Based on gh#flasgger/flasgger#629
 Patch0:         remove-six.patch
+# PATCH-FIX-UPSTREAM gh#flasgger/flasgger#633
+Patch1:         support-click-8.2.patch
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
diff --git a/support-click-8.2.patch b/support-click-8.2.patch
new file mode 100644
index 0000000..bc25bff
--- /dev/null
+++ b/support-click-8.2.patch
@@ -0,0 +1,39 @@
+From 08591b60e988c0002fcf1b1e9f98b78e041d2732 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Tue, 4 Mar 2025 10:13:55 +0000
+Subject: [PATCH] Fix tests with Click 8.2
+
+https://github.com/pallets/click/pull/2523 introduced changes to
+`click.testing` that broke a few unit tests in Flasgger:
+`mix_stderr=False` is now effectively the default and can no longer be
+specified explicitly.  Although this Click version hasn't been fully
+released yet, this adjusts Flasgger to work with both old and new
+versions.
+---
+ tests/conftest.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index bb83d682..5acb4923 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -1,7 +1,9 @@
++import inspect
+ import json
+ import random
+ 
+ import pytest
++from click.testing import CliRunner
+ from flasgger import Swagger
+ from flasgger.utils import get_examples
+ 
+@@ -99,4 +101,8 @@ def app():
+ 
+ @pytest.fixture(scope="function")
+ def cli_runner(app):
+-    yield app.test_cli_runner(mix_stderr=False)
++    kwargs = {}
++    if "mix_stderr" in inspect.signature(CliRunner).parameters:
++        # click < 8.2
++        kwargs["mix_stderr"] = False
++    yield app.test_cli_runner(**kwargs)