diff --git a/pytest.spec b/pytest.spec
index ffe5648..3134974 100644
--- a/pytest.spec
+++ b/pytest.spec
@@ -1,6 +1,6 @@
 Name:           pytest
 Version:        4.6.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple powerful testing with Python
 License:        MIT
 URL:            https://pytest.org
@@ -13,17 +13,20 @@ Patch0:         5539.patch
 # The test in this specfile use pytest-timeout
 # When building pytest for the first time with new Python version
 # that is not possible as it depends on pytest
-%bcond_without timeout
+#bcond_without timeout
+%bcond_with timeout
 
 # When building pytest for the first time with new Python version
 # we might not yet have all the BRs, this allows us to build without some that
 # are likely not yet built.
 # Pytest will skip the related tests, so we only conditionalize the BRs
-%bcond_without optional_tests
+#bcond_without optional_tests
+%bcond_with optional_tests
 
 # When building pytest for the first time with new Python version
 # we also don't have sphinx yet and cannot build docs.
-%bcond_without docs
+#bcond_without docs
+%bcond_with docs
 
 %if %{with docs}
 BuildRequires:  %{_bindir}/rst2html
@@ -143,6 +146,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \
 %{python3_sitelib}/__pycache__/pytest.*
 
 %changelog
+* Thu Aug 15 2019 Richard Shaw <hobbes1069@gmail.com> - 4.6.5-2
+- Bootstrap build for Python 3.8, all optional BRs disabled.
+
 * Wed Aug 14 2019 Thomas Moschny <thomas.moschny@gmx.de> - 4.6.5-1
 - Update to 4.6.5.
 - Add missing BR on make.