diff --git a/python-ptyprocess.spec b/python-ptyprocess.spec
index 0af35f6..8dd15ec 100644
--- a/python-ptyprocess.spec
+++ b/python-ptyprocess.spec
@@ -1,23 +1,17 @@
-%global modname ptyprocess
+%global srcname ptyprocess
 
 %bcond_without tests
 
 Name:           python-ptyprocess
 Version:        0.6.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Run a subprocess in a pseudo terminal
 
 License:        ISC
 URL:            https://github.com/pexpect/ptyprocess
-Source0:        https://files.pythonhosted.org/packages/source/p/ptyprocess/ptyprocess-%{version}.tar.gz
+Source:         %{pypi_source}
 
 BuildArch:      noarch
-BuildRequires:  python2-devel
-BuildRequires:  python%{python3_pkgversion}-devel
-%if %{with tests}
-BuildRequires:  pytest
-BuildRequires:  python%{python3_pkgversion}-pytest
-%endif
 
 %description
 Launch a subprocess in a pseudo terminal (pty), and interact with both the
@@ -25,24 +19,34 @@ process and its pty.
 
 %package -n python2-ptyprocess
 Summary:        Run a subprocess in a pseudo terminal
-%{?python_provide:%python_provide python2-%{modname}}
+%{?python_provide:%python_provide python2-%{srcname}}
+BuildRequires:  python2-devel
+%if %{with tests}
+BuildRequires:  python2-pytest
+%endif
+
 %description -n python2-ptyprocess
 Launch a subprocess in a pseudo terminal (pty), and interact with both the
 process and its pty.
 
-%package -n python%{python3_pkgversion}-ptyprocess
+%package -n python3-ptyprocess
 Summary:        Run a subprocess in a pseudo terminal
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}}
-%description -n python%{python3_pkgversion}-ptyprocess
+%{?python_provide:%python_provide python3-%{srcname}}
+BuildRequires:  python3-devel
+%if %{with tests}
+BuildRequires:  python3-pytest
+%endif
+
+%description -n python3-ptyprocess
 Launch a subprocess in a pseudo terminal (pty), and interact with both the
 process and its pty.
 
 %prep
-%setup -qn ptyprocess-%{version}
+%autosetup -n ptyprocess-%{version}
 
 %build
-%py2_build
 %py3_build
+%py2_build
 
 %install
 %py3_install
@@ -50,23 +54,26 @@ process and its pty.
 
 %if %{with tests}
 %check
-%{_bindir}/py.test-3.* -v
-%{_bindir}/py.test-2.* -v
+%{__python3} -m pytest -v
+%{__python2} -m pytest -v
 %endif
 
 %files -n python2-ptyprocess
 %license LICENSE
 %doc README.rst
 %{python2_sitelib}/ptyprocess/
-%{python2_sitelib}/ptyprocess-%{version}-py?.?.egg-info
+%{python2_sitelib}/ptyprocess-*.egg-info
 
-%files -n python%{python3_pkgversion}-ptyprocess
+%files -n python3-ptyprocess
 %license LICENSE
 %doc README.rst
 %{python3_sitelib}/ptyprocess/
-%{python3_sitelib}/ptyprocess-%{version}-py?.?.egg-info
+%{python3_sitelib}/ptyprocess-*.egg-info
 
 %changelog
+* Mon Jul 29 07:16:43 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.0-6
+- Fix FTBFS
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild