diff --git a/python-pytest.changes b/python-pytest.changes
index ed3e203..d24b04d 100644
--- a/python-pytest.changes
+++ b/python-pytest.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Jul 29 13:01:56 UTC 2015 - toddrme2178@gmail.com
+
+- Make tests conditional to avoid dependency loop.
+
+-------------------------------------------------------------------
+Mon Jul 27 09:29:06 UTC 2015 - seife+obs@b1-systems.com
+
+- revert update-alternatives change, causes OBS trouble
+
+-------------------------------------------------------------------
+Fri Jul 24 06:37:21 UTC 2015 - seife+obs@b1-systems.com
+
+- Change update-alternatives requirement to absolute path to fix
+  non-SUSE distributions (RHEL7)
+
 -------------------------------------------------------------------
 Mon Jul  6 17:59:24 UTC 2015 - rjschwei@suse.com
 
diff --git a/python-pytest.spec b/python-pytest.spec
index d24d5fc..25d529b 100644
--- a/python-pytest.spec
+++ b/python-pytest.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-pytest
 Version:        2.7.1
@@ -31,8 +34,10 @@ BuildRequires:  python-setuptools
 BuildRequires:  unzip
 # Test requirements:
 BuildRequires:  lsof
+%if %{with test}
 BuildRequires:  python-mock
 BuildRequires:  python-pexpect
+%endif
 BuildRequires:  python-xml
 Requires:       python-py >= 1.4.25
 Requires(post): update-alternatives
@@ -72,11 +77,8 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 rm %{buildroot}%{_bindir}/py.test 
 ln -s %{_bindir}/py.test-%{py_ver} %{buildroot}%{_bindir}/py.test
 
-%if 0%{?suse_version} > 1110
+%if %{with test} && 0%{?suse_version} > 1110
 %check
-#FIXME (mvyskocil): test fail on doc/en/example/nonpython/test_simple.yml
-#maybe too old python-PyYAML package? Factory has 3.12, where latest upstream is 13.12.0
-
 python setup.py test
 %endif