diff --git a/.gitignore b/.gitignore
index 221a269..9e08dc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /flexmock-0.10.0.tar.gz
 /flexmock-0.10.1.tar.gz
 /flexmock-0.10.2.tar.gz
+/flexmock-0.10.4.tar.gz
diff --git a/python-flexmock.spec b/python-flexmock.spec
index d64e0d2..2643419 100644
--- a/python-flexmock.spec
+++ b/python-flexmock.spec
@@ -1,32 +1,13 @@
-%global with_python3 1
-
 Name:           python-flexmock
-Version:        0.10.2
-Release:        15%{?dist}
+Version:        0.10.4
+Release:        1%{?dist}
 Summary:        Testing library that makes it easy to create mocks, stubs and fakes
 
 License:        BSD
 URL:            https://flexmock.readthedocs.org
-Source0:        https://pypi.python.org/packages/source/f/flexmock/flexmock-%{version}.tar.gz
+Source0:        %{pypi_source flexmock}
 
 BuildArch:      noarch
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-
-# for testing with various runners (twisted contains trial)
-BuildRequires:  python2-nose
-BuildRequires:  python2-pytest
-BuildRequires:  python2-twisted
-
-%if 0%{with_python3}
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-
-# for testing with various runners (no twisted on py3 yet)
-BuildRequires:  python3-nose
-BuildRequires:  python3-pytest
-%endif
-
 
 %global _description\
 Flexmock is a testing library for Python that makes it easy to create mocks,\
@@ -35,64 +16,58 @@ Python flexmock is not a clone of the Ruby version. It omits a number of\
 redundancies in the Ruby flexmock API, alters some defaults, and introduces\
 a number of Python-only features.\
 
-
 %description %_description
 
+
 %package -n python2-flexmock
-Summary: %summary
+Summary:        %{summary}
+
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+
+# for testing with various runners (twisted contains trial)
+BuildRequires:  python2-nose
+BuildRequires:  python2-pytest
+BuildRequires:  python2-twisted
+
 %{?python_provide:%python_provide python2-flexmock}
 
 %description -n python2-flexmock %_description
 
-%if 0%{?with_python3}
+
 %package -n python3-flexmock
-Summary:        Testing library that makes it easy to create mocks, stubs and fakes
+Summary:        %{summary}
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 
-%description -n python3-flexmock
-Flexmock is a testing library for Python that makes it easy to create mocks,
-stubs and fakes. The API is inspired by a Ruby library of the same name, but
-Python flexmock is not a clone of the Ruby version. It omits a number of
-redundancies in the Ruby flexmock API, alters some defaults, and introduces
-a number of Python-only features.
-%endif # with_python3
+# for testing with various runners (twisted contains trial)
+BuildRequires:  python3-nose
+BuildRequires:  python3-pytest
+BuildRequires:  python3-twisted
+
+%{?python_provide:%python_provide python3-flexmock}
+
+%description -n python3-flexmock %_description
 
 
 %prep
 %setup -q -n flexmock-%{version}
 
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif # with_python3
-
 
 %build
-# export lang so that python3 can properly decode readme
-%{__python2} setup.py build
-
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py build
-popd
-%endif # with_python3
+%py2_build
+%py3_build
 
 
 %install
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root %{buildroot}
-popd
-%endif # with_python3
-
-%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
+%py2_install
+%py3_install
 
 
 %check
 PYEXECS=%{__python2} ./tests/run_tests.sh
-
-%if 0%{?with_python3}
 PYEXECS=%{__python3} ./tests/run_tests.sh
-%endif
 
  
 %files -n python2-flexmock
@@ -100,17 +75,18 @@ PYEXECS=%{__python3} ./tests/run_tests.sh
 %doc README.rst CHANGELOG docs/
 %{python2_sitelib}/flexmock*
 
-%if 0%{?with_python3}
 
 %files -n python3-flexmock
 %license LICENSE
 %doc README.rst CHANGELOG docs/
 %{python3_sitelib}/flexmock*
 %{python3_sitelib}/__pycache__/flexmock*
-%endif
 
 
 %changelog
+* Fri Apr 12 2019 Miro Hrončok <mhroncok@redhat.com> - 0.10.4-1
+- Update to 0.10.4 for pytest 4 compatibility (#1699241)
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.2-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 94646e3..f2fac31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5767113cc7169ad2b8d906c159fd2eba  flexmock-0.10.2.tar.gz
+SHA512 (flexmock-0.10.4.tar.gz) = d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc