diff --git a/python-six-doc.changes b/python-six-doc.changes
index 939c9d0..087059b 100644
--- a/python-six-doc.changes
+++ b/python-six-doc.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jan 19 09:07:19 UTC 2016 - toddrme2178@gmail.com
+
+- Run tests in -doc package to avoid dependency loops
+  * python-setuptools -> python-six -> python-py -> python-setuptools
+  * python-setuptools -> python-six -> python-pytest -> python-setuptools
+- Actually run the tests.  They weren't previously being run.
+
 -------------------------------------------------------------------
 Fri Oct  9 08:17:49 UTC 2015 - mcihar@suse.cz
 
diff --git a/python-six-doc.spec b/python-six-doc.spec
index 2a35cea..5551764 100644
--- a/python-six-doc.spec
+++ b/python-six-doc.spec
@@ -25,8 +25,12 @@ License:        MIT
 Group:          Development/Libraries/Python
 Source:         http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  python-six
+# Documentation requirements:
 BuildRequires:  python-Sphinx
-BuildRequires:  python-devel
+# Test requirements:
+BuildRequires:  python-py
+BuildRequires:  python-pytest
 BuildArch:      noarch
 
 %description
@@ -45,6 +49,16 @@ what is provided.
 cd documentation && make html && rm _build/html/.buildinfo
 
 %install
+# only build documentation
+
+# Run tests here to avoid dependency loop
+%check
+mkdir test
+cp test_six.py test
+pushd test
+py.test test_six.py
+popd
+rm -rf test
 
 %files
 %defattr(-,root,root)
diff --git a/python-six.changes b/python-six.changes
index 3cd7079..b34216f 100644
--- a/python-six.changes
+++ b/python-six.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jan 19 09:07:19 UTC 2016 - toddrme2178@gmail.com
+
+- Run tests in -doc package to avoid dependency loops
+  * python-setuptools -> python-six -> python-py -> python-setuptools
+  * python-setuptools -> python-six -> python-pytest -> python-setuptools
+- Actually run the tests.  They weren't previously being run.
+
 -------------------------------------------------------------------
 Fri Oct  9 08:17:49 UTC 2015 - mcihar@suse.cz
 
diff --git a/python-six.spec b/python-six.spec
index 5acf9fd..3eb9464 100644
--- a/python-six.spec
+++ b/python-six.spec
@@ -15,11 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-# NOTE(saschpe): git invocation and pythonpath issues with testrepository
-# enable testing with a build conditional (off by default):
-%bcond_with test
-
 Name:           python-six
 Version:        1.10.0
 Release:        0
@@ -30,19 +25,12 @@ Group:          Development/Libraries/Python
 Source:         http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
-%if %{with test}
-# Test requirements:
-BuildRequires:  python-py
-BuildRequires:  python-pytest
-%endif
 %if 0%{?suse_version} <= 1110
 BuildRequires:  python-argparse
 Requires:       python-argparse
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%else
-BuildArch:      noarch
-%py_requires
 %endif
+BuildArch:      noarch
 
 %description
 Six is a Python 2 and 3 compatibility library. It provides utility 
@@ -62,10 +50,9 @@ python setup.py build
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%if %{with test}
-%check
-python test_six.py
-%endif
+# Run tests in -doc package to avoid dependency loop
+# %check
+# python test_six.py
 
 %pre
 # previous versions of the package installed .egg-info as a directory,
@@ -78,6 +65,6 @@ fi
 %defattr(-,root,root)
 %doc LICENSE README
 %{python_sitelib}/six.py*
-%{python_sitelib}/six-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/six-%{version}-py*.egg-info
 
 %changelog