diff --git a/python-six.changes b/python-six.changes
index a07791d..afd93c3 100644
--- a/python-six.changes
+++ b/python-six.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 29 13:01:56 UTC 2015 - toddrme2178@gmail.com
+
+- Make tests conditional to avoid dependency loop.
+
 -------------------------------------------------------------------
 Thu Apr 16 10:41:33 UTC 2015 - hpj@urpla.net
 
diff --git a/python-six.spec b/python-six.spec
index cf687b1..cbe59d1 100644
--- a/python-six.spec
+++ b/python-six.spec
@@ -15,6 +15,9 @@
 # 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.9.0
@@ -26,9 +29,11 @@ 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
@@ -56,8 +61,10 @@ python setup.py build
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
+%if %{with test}
 %check
 python test_six.py
+%endif
 
 %files
 %defattr(-,root,root)