diff --git a/pyflakes.spec b/pyflakes.spec
index 0545488..3b41746 100644
--- a/pyflakes.spec
+++ b/pyflakes.spec
@@ -1,13 +1,13 @@
 Name:           pyflakes
 # WARNING: When updating pyflakes, check not to break flake8!
-Version:        2.1.1
-Release:        7%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        A simple program which checks Python source files for errors
 
 License:        MIT
 URL:            https://github.com/PyCQA/pyflakes
 
-Source0:        https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Source0:        %{pypi_source}
 Source1:        http://cdn.debian.net/debian/pool/main/p/pyflakes/pyflakes_2.0.0-1.debian.tar.xz
 Patch0:         %{name}-1.1.0-python3-man.patch
 
@@ -29,7 +29,7 @@ check on style.
 Summary:        %{summary}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
-Requires:       python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-pytest
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
 
 %description -n python%{python3_pkgversion}-%{name}
@@ -57,7 +57,8 @@ ln -s pyflakes-3.1 %{buildroot}%{_mandir}/man1/pyflakes.1
 
 
 %check
-%{__python3} -Wall setup.py test
+# The deselected tests are failing with 3.9.0b1+ due to whitespace differences: https://github.com/PyCQA/pyflakes/issues/549
+%pytest -k "not (test_invalidEscape or test_nonDefaultFollowsDefaultSyntaxError or test_nonKeywordAfterKeywordSyntaxError)"
 
 
 %files -n python%{python3_pkgversion}-%{name}
@@ -73,6 +74,10 @@ ln -s pyflakes-3.1 %{buildroot}%{_mandir}/man1/pyflakes.1
 %{_mandir}/man1/pyflakes.1*
 
 %changelog
+* Sun May 31 2020 Miro Hrončok <mhroncok@redhat.com> - 2.2.0-1
+- Update to 2.2.0 (#1822843)
+- Workaround Python 3.9 problems (#1831248)
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.1.1-7
 - Rebuilt for Python 3.9
 
diff --git a/sources b/sources
index 1ca3b99..baf6ecb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (pyflakes_2.0.0-1.debian.tar.xz) = 93d052884859d2342372b3ab38efae99626a9e4c1b761ffc87c683f436b4f1f6852597781447d15acc6a10c93a838f41dd1944cb40eb6e0bd9cc5c1cf160122a
-SHA512 (pyflakes-2.1.1.tar.gz) = 7ebf5843b38146305c1063e070480fea8ec3b47fa1be546b1fafaeb242a688a5a001f978e7257fd71d5905b9a338b466ef17c7330725191587e9c40ba632c3f8
+SHA512 (pyflakes-2.2.0.tar.gz) = 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35