diff --git a/python-pbr.changes b/python-pbr.changes
index 6a0d47e..e89060c 100644
--- a/python-pbr.changes
+++ b/python-pbr.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Mar 26 20:02:01 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
+
+- Add Recomends for git-core and python-reno
+- Add Suggests for python-Sphinx and python-nose
+- Increase minimum dependency versions to match upstream
+- Add build dependency pip, pyparsing, reno and testrepository
+  used by the test suite
+- Remove unnecessary test dependencies coverage and hacking
+- Use OS_TEST_TIMEOUT=60 in %check to fix sparodic failing tests
+  due to timeouts with the default 30 seconds
+- Remove no longer needed steps in %prep due to upstream changes
+- Replace build dependency git with smaller git-core
+
 -------------------------------------------------------------------
 Fri Mar  1 14:36:24 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
 
diff --git a/python-pbr.spec b/python-pbr.spec
index ca328b6..9c90ba2 100644
--- a/python-pbr.spec
+++ b/python-pbr.spec
@@ -39,23 +39,31 @@ BuildRequires:  python-rpm-macros
 #!BuildIgnore:  python2-pyparsing
 #!BuildIgnore:  python3-pyparsing
 Requires:       python-setuptools
+Recommends:     git-core
+Recommends:     python-reno >= 2.5.0
+Suggests:       python-Sphinx >= 1.6.5
+Suggests:       python-nose
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 Obsoletes:      python-pbr-doc
 BuildArch:      noarch
 %if %{with test}
-BuildRequires:  %{python_module Sphinx >= 1.6.2}
+BuildRequires:  %{python_module Sphinx >= 1.6.5}
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module fixtures >= 3.0.0}
 BuildRequires:  %{python_module mock >= 2.0}
-BuildRequires:  %{python_module six >= 1.9.0}
-BuildRequires:  %{python_module stestr}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module pyparsing >= 2.0.2}
+BuildRequires:  %{python_module reno >= 2.5.0}
+BuildRequires:  %{python_module six >= 1.10.0}
+BuildRequires:  %{python_module stestr >= 2.1.0}
+BuildRequires:  %{python_module testrepository >= 0.0.18}
 BuildRequires:  %{python_module testresources >= 2.0.0}
 BuildRequires:  %{python_module testscenarios >= 0.4}
 BuildRequires:  %{python_module testtools >= 2.2.0}
 BuildRequires:  %{python_module virtualenv >= 14.0.6}
-BuildRequires:  %{python_module wheel}
-BuildRequires:  git
+BuildRequires:  %{python_module wheel >= 0.32.0}
+BuildRequires:  git-core
 BuildRequires:  gpg2
 %endif
 %python_subpackages
@@ -71,12 +79,7 @@ information.
 %setup -q -n pbr-%{version}
 %autopatch -p1
 
-# Get rid of ugly build-time deps that require network:
-sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py
-
-# drop interpreter from test setup.py
-sed -i "1s|^#!/.*||" pbr/tests/testpackage/setup.py
-chmod -x pbr/tests/testpackage/setup.py
+sed -i '/coverage/d;/hacking/d' test-requirements.txt
 
 %build
 %python_build
@@ -92,6 +95,7 @@ chmod -x pbr/tests/testpackage/setup.py
 
 %if %{with test}
 %check
+export OS_TEST_TIMEOUT=60
 %python_exec -m stestr.cli run
 %endif