diff --git a/2.2.0.tar.gz b/2.2.0.tar.gz
deleted file mode 100644
index ba1fc82..0000000
--- a/2.2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0cf4910ce77641f4cc43483aae3ea84a42e3ff7ba52f5a8b133d98eb9fce5902
-size 75856
diff --git a/capitalization.patch b/capitalization.patch
deleted file mode 100644
index 96f4f4d..0000000
--- a/capitalization.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: jirafs-2.2.0/requirements.txt
-===================================================================
---- jirafs-2.2.0.orig/requirements.txt
-+++ jirafs-2.2.0/requirements.txt
-@@ -1,7 +1,7 @@
- jira>=2.0.0,<3
- python-dateutil>=2.8.1,<3
- blessings>=1.5.1,<2.0
--prettytable>=0.7.2,<1.0
-+PrettyTable>=0.7.2,<1.0
- environmental-override>=0.1.2,<1.0.0
- jinja2>=2.10.3,<3.0
- watchdog>=0.9.0,<1.0.0
diff --git a/jirafs-2.2.1.tar.gz b/jirafs-2.2.1.tar.gz
new file mode 100644
index 0000000..b2e3b13
--- /dev/null
+++ b/jirafs-2.2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc2528fd473d37d7f7821e646612d98dec1c3677615a9efc5d635417fdc4ce2a
+size 79197
diff --git a/python-jirafs.changes b/python-jirafs.changes
index 1d42e55..315aa9f 100644
--- a/python-jirafs.changes
+++ b/python-jirafs.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Nov 24 00:50:36 UTC 2020 - John Vandenberg <jayvdb@gmail.com>
+
+- Remove capitalisation.patch, as capitalisation of names does not
+  prevent setuptools from finding installed packages
+- Remove upper pins on dependency versions
+- Add missing dependencies and specify minimum versions
+- Switch to PyPI sdist
+- Activate test suite, and remove unnecessary build dependency tox
+- Update to v2.2.1
+  * Fallback to displayName if name is not available for
+    comment author
+
 -------------------------------------------------------------------
 Tue Feb 25 04:21:46 UTC 2020 - Steve Kowalik <steven.kowalik@suse.com>
 
diff --git a/python-jirafs.spec b/python-jirafs.spec
index 9fba39b..45bcb8f 100644
--- a/python-jirafs.spec
+++ b/python-jirafs.spec
@@ -19,31 +19,40 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define         skip_python2 1
 Name:           python-jirafs
-Version:        2.2.0
+Version:        2.2.1
 Release:        0
 Summary:        Library for editing JIRA issues as local text files
 License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/coddingtonbear/jirafs
-Source:         https://github.com/coddingtonbear/jirafs/archive/%{version}.tar.gz
-Patch0:         capitalization.patch
-BuildRequires:  %{python_module PrettyTable}
-BuildRequires:  %{python_module behave}
-BuildRequires:  %{python_module blessings}
-BuildRequires:  %{python_module environmental-override}
-BuildRequires:  %{python_module ipdb}
-BuildRequires:  %{python_module jira}
-BuildRequires:  %{python_module mock}
+Source:         https://files.pythonhosted.org/packages/source/j/jirafs/jirafs-%{version}.tar.gz
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module tox}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-PrettyTable
-Requires:       python-blessings
-Requires:       python-environmental-override
-Requires:       python-ipdb
-Requires:       python-jira >= 2
+Requires:       git-core
+Requires:       python-Jinja2 >= 2.10.3
+Requires:       python-PrettyTable >= 0.7.2
+Requires:       python-blessings >= 1.5.1
+Requires:       python-environmental-override >= 0.1.2
+Requires:       python-jira >= 2.0.0
+Requires:       python-python-dateutil >= 2.8.1
+Requires:       python-watchdog >= 0.9.0
+Suggests:       python-ipdb
 BuildArch:      noarch
+# SECTION test requirements
+BuildRequires:  %{python_module Jinja2 >= 2.10.3}
+BuildRequires:  %{python_module PrettyTable >= 0.7.2}
+BuildRequires:  %{python_module behave}
+BuildRequires:  %{python_module blessings >= 1.5.1}
+BuildRequires:  %{python_module environmental-override >= 0.1.2}
+BuildRequires:  %{python_module ipdb}
+BuildRequires:  %{python_module jira >= 2.0.0}
+BuildRequires:  %{python_module mock}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module python-dateutil >= 2.8.1}
+BuildRequires:  %{python_module watchdog >= 0.9.0}
+BuildRequires:  git-core
+# /SECTION
 %python_subpackages
 
 %description
@@ -53,7 +62,9 @@ issues as a collection of text files using an interface inspired by
 
 %prep
 %setup -q -n jirafs-%{version}
-%autopatch -p1
+# Remove upper pins
+sed -i 's/,<[0-9.][0-9.]*//' requirements.txt
+rm jirafs/.pre-commit-config.yaml
 
 %build
 %python_build
@@ -63,8 +74,9 @@ issues as a collection of text files using an interface inspired by
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-# tests require running JIRA instance
-#%%python_exec -m unittest discover -v
+git config --global user.name "John Doe"
+git config --global user.email johndoe@example.com
+%pytest -rs
 
 %files %{python_files}
 %{_bindir}/jirafs