diff --git a/python-setproctitle.changes b/python-setproctitle.changes
index 64f60c9..32e54a7 100644
--- a/python-setproctitle.changes
+++ b/python-setproctitle.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Aug 16 07:30:43 UTC 2020 - John Vandenberg <jayvdb@gmail.com>
+
+- Revert to working test suite, re-adding use-pkg-config.patch,
+  and replace nose with pytest
+
 -------------------------------------------------------------------
 Tue Mar 10 11:56:23 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-setproctitle.spec b/python-setproctitle.spec
index c64ee46..29787f7 100644
--- a/python-setproctitle.spec
+++ b/python-setproctitle.spec
@@ -24,9 +24,13 @@ Summary:        Python module to allow customization of the process title
 License:        BSD-3-Clause
 URL:            https://github.com/dvarrazzo/py-setproctitle/
 Source:         https://files.pythonhosted.org/packages/source/s/setproctitle/setproctitle-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM Test build/harness helper; heavily revised in next release jayvdb@gmail.com
+Patch0:         use-pkg-config.patch
 BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module nose}
+BuildRequires:  %{python_module modernize}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  pkg-config
 BuildRequires:  procps
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-tools
@@ -40,6 +44,8 @@ the OpenSSH Server for example.
 
 %prep
 %setup -q -n setproctitle-%{version}
+%autopatch -p1
+python-modernize -nw tests
 
 %build
 export CFLAGS="%{optflags}"
@@ -50,11 +56,11 @@ export CFLAGS="%{optflags}"
 
 %check
 export LANG=en_US.UTF-8
-# The tests actually fail under python3 and upstream does load of magic to get
-# them operational, lets wait a bit for them to sort it out
-#%%{python_expand export PYTHONPATH=$(pwd):%{buildroot}%{$python_sitearch}
-#%%make_build PYTHON=$python check
-#}
+%{python_expand export PYTHON=$python
+PYTHON_MAJOR=${PYTHON:6:1}
+make tests/pyrun${PYTHON_MAJOR}
+PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m pytest -v
+}
 
 %files %{python_files}
 %doc HISTORY.rst README.rst
diff --git a/use-pkg-config.patch b/use-pkg-config.patch
new file mode 100644
index 0000000..ed55d02
--- /dev/null
+++ b/use-pkg-config.patch
@@ -0,0 +1,22 @@
+@@ -1,21 +0,0 @@
+--- a/Makefile.orig        2019-09-15 17:13:27.656631109 +0700
++++ b/Makefile        2019-09-15 17:16:00.458264928 +0700
+@@ -7,15 +7,15 @@
+ 
+ # Customize these to select the Python to build/test
+ PYTHON ?= python
+-PYCONFIG ?= python-config
++PYCONFIG ?= pkg-config
+ PY2TO3 ?= 2to3
+ 
+ # PYVER value is 2 or 3
+ PYVER := $(shell $(PYTHON) -c "import sys; print(sys.version_info[0])")
+ ROOT_PATH := $(shell pwd)
+ 
+-PYINC := $(shell $(PYCONFIG) --includes)
+-PYLIB := $(shell $(PYCONFIG) --ldflags) -L$(shell $(PYCONFIG) --prefix)/lib
++PYINC := $(shell $(PYCONFIG) python$(PYVER)-embed --cflags) $(shell $(PYCONFIG) python$(PYVER) --cflags)
++PYLIB := $(shell $(PYCONFIG) python$(PYVER)-embed --libs) $(shell $(PYCONFIG) python$(PYVER) --libs)
+ 
+ BUILD_DIR = build/lib.$(PYVER)
+ 
\ No newline at end of file