diff --git a/.gitignore b/.gitignore
index 90cfcca..aa490da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ netaddr-0.7.4.tar.gz
 /netaddr-0.7.11.tar.gz
 /netaddr-0.7.12.tar.gz
 /netaddr-0.7.14.tar.gz
+/netaddr-0.7.15.tar.gz
+/netaddr-0.7.15-tests.tar.gz
diff --git a/python-netaddr.spec b/python-netaddr.spec
index 958e2e0..5f5f3dd 100644
--- a/python-netaddr.spec
+++ b/python-netaddr.spec
@@ -3,13 +3,14 @@
 %endif
 
 Name:           python-netaddr
-Version:        0.7.14
-Release:        2%{?dist}
+Version:        0.7.15
+Release:        1%{?dist}
 Summary:        A pure Python network address representation and manipulation library
 
 License:        BSD
 URL:            http://github.com/drkjam/netaddr
 Source0:        https://pypi.python.org/packages/source/n/netaddr/netaddr-%{version}.tar.gz
+Source1:        netaddr-%{version}-tests.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -81,7 +82,7 @@ API documentation for the latest release is available here :-
 %endif
 
 %prep
-%setup -q -n netaddr-%{version}
+%setup -q -a 1 -n netaddr-%{version}
 
 # Make rpmlint happy, get rid of DOS line endings
 %{__sed} -i 's/\r//' netaddr/*.py
@@ -94,7 +95,7 @@ find netaddr -name "*.py" | \
   xargs %{__perl} -ni -e 'print unless /usr\/bin\/python|env\s+python/'
 
 # Make rpmlint happy, fix permissions on documentation files
-chmod 0644 README AUTHORS CHANGELOG COPYRIGHT INSTALL LICENSE PKG-INFO
+chmod 0644 README.md AUTHORS CHANGELOG COPYRIGHT INSTALL LICENSE PKG-INFO
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -131,26 +132,30 @@ popd
 
 
 %check
-%{__python2} netaddr/tests/__init__.py
+%{__python2} setup.py test
 %if 0%{?with_python3}
-LANG=en_US.UTF-8 %{__python3} netaddr/tests/__init__.py
+LANG=en_US.UTF-8 %{__python3} setup.py test
 %endif
 
 %files
 %doc AUTHORS CHANGELOG COPYRIGHT INSTALL LICENSE PKG-INFO
-%doc README docs/html
+%doc README.md docs/html
 %{python_sitelib}/*
 %{_bindir}/netaddr
 
 %if 0%{?with_python3}
 %files -n python3-netaddr
 %doc AUTHORS CHANGELOG COPYRIGHT INSTALL LICENSE PKG-INFO
-%doc README docs/python3/html
+%doc README.md docs/python3/html
 %{python3_sitelib}/*
 %{_bindir}/netaddr3
 %endif
 
 %changelog
+* Mon Jun 29 2015 John Eckersberg <eck@redhat.com> - 0.7.15-1
+- New upstream release 0.7.15
+- Add separate source for tests, see https://github.com/drkjam/netaddr/issues/102
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 8c91604..5d4c1a6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-1ba9d1e887c838f190774cf6b74c109d  netaddr-0.7.14.tar.gz
+bd024c8f82f71fd1d90553da64735f14  netaddr-0.7.15.tar.gz
+0616a1cc9030059e59991e13433b5538  netaddr-0.7.15-tests.tar.gz