diff --git a/python-six.changes b/python-six.changes
index a07791d..4bdd063 100644
--- a/python-six.changes
+++ b/python-six.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Aug  4 07:50:17 UTC 2015 - dimstar@opensuse.org
+
+- Delete the system egg-info during pre phase: older versions of
+  the package installed it as a directory, the latest update
+  creates a file, and rpm has known issues with replacing this.
+
+-------------------------------------------------------------------
+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..88f9cf2 100644
--- a/python-six.spec
+++ b/python-six.spec
@@ -16,6 +16,10 @@
 #
 
 
+# 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
 Release:        0
@@ -26,9 +30,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 +62,17 @@ python setup.py build
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
+%if %{with test}
 %check
 python test_six.py
+%endif
+
+%pre
+# previous versions of the package installed .egg-info as a directory,
+# the new update now installs it as a file. Clean out the directory, should it exist.
+if [ -d %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info ]; then
+  rm -rf %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info
+fi
 
 %files
 %defattr(-,root,root)