diff --git a/python-netaddr.spec b/python-netaddr.spec
index 1170e04..0563599 100644
--- a/python-netaddr.spec
+++ b/python-netaddr.spec
@@ -4,7 +4,7 @@
 
 Name:           python-netaddr
 Version:        0.7.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A pure Python network address representation and manipulation library
 
 License:        BSD
@@ -15,6 +15,7 @@ BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-sphinx
+BuildRequires:  pytest
 
 %description
 A pure Python network address representation and manipulation library.
@@ -50,6 +51,7 @@ Summary: A pure Python network address representation and manipulation library
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-sphinx
+BuildRequires:  python3-pytest
 
 %description -n python3-netaddr
 A pure Python network address representation and manipulation library.
@@ -87,6 +89,7 @@ API documentation for the latest release is available here :-
 %{__sed} -i 's/\r//' netaddr/*.py
 %{__sed} -i 's/\r//' netaddr/ip/*.py
 %{__sed} -i 's/\r//' netaddr/eui/*.idx
+rm -rf runtests.py
 
 # Make rpmlint happy, rip out python shebang lines from most python
 # modules
@@ -131,9 +134,9 @@ popd
 
 
 %check
-%{__python2} setup.py test
+py.test-%{python2_version}
 %if 0%{?with_python3}
-LANG=en_US.UTF-8 %{__python3} setup.py test
+LANG=en_US.UTF-8 py.test-%{python3_version}
 %endif
 
 %files
@@ -151,6 +154,10 @@ LANG=en_US.UTF-8 %{__python3} setup.py test
 %endif
 
 %changelog
+* Sun Nov 22 2015 Robert Kuska <rkuska@redhat.com> - 0.7.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+- Delete file which contains bundled pytest
+
 * Wed Nov 11 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5