diff --git a/python-rdflib.changes b/python-rdflib.changes
index 2ca033a..5fa8c08 100644
--- a/python-rdflib.changes
+++ b/python-rdflib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 30 13:06:06 UTC 2013 - saschpe@suse.de
+
+- Run testsuite everywhere
+- Macro cleanup
+
 -------------------------------------------------------------------
 Sun Jan 13 16:52:06 UTC 2013 - p.drouand@gmail.com
 
diff --git a/python-rdflib.spec b/python-rdflib.spec
index 8233a6d..115caf8 100644
--- a/python-rdflib.spec
+++ b/python-rdflib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-rdflib
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,21 +25,19 @@ Group:          Development/Libraries/Python
 Url:            http://rdflib.net/
 Source:         http://pypi.python.org/packages/source/r/rdflib/rdflib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  fdupes
 BuildRequires:  python-Sphinx
 BuildRequires:  python-devel
 BuildRequires:  python-isodate
 BuildRequires:  python-nose
 BuildRequires:  python-xml
-BuildRequires:	fdupes
 Requires:       python-isodate
 Requires:       python-xml
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} > 1110
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%else
 BuildArch:      noarch
 %endif
-%endif
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 RDFLib is a Python library for working with RDF, a simple yet powerful
@@ -62,10 +60,8 @@ rm -r _build/html/.buildinfo
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 %fdupes -s build/html
 
-%if 0%{?suse_version} >= 1220
 %check
 python setup.py test
-%endif
 
 %files
 %defattr(-,root,root)
diff --git a/python3-rdflib.changes b/python3-rdflib.changes
index e6c4da4..caccd69 100644
--- a/python3-rdflib.changes
+++ b/python3-rdflib.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 30 13:06:17 UTC 2013 - saschpe@suse.de
+
+- Run testsuite everywhere
+
 -------------------------------------------------------------------
 Sun Jan 13 15:25:50 UTC 2013 - p.drouand@gmail.com
 
diff --git a/python3-rdflib.spec b/python3-rdflib.spec
index aa8d9be..4bcbd30 100644
--- a/python3-rdflib.spec
+++ b/python3-rdflib.spec
@@ -25,14 +25,15 @@ Group:          Development/Libraries/Python
 Url:            http://rdflib.net/
 Source:         http://pypi.python.org/packages/source/r/rdflib/rdflib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  fdupes
 BuildRequires:  python-Sphinx
 BuildRequires:  python3
+BuildRequires:  python3-2to3
 BuildRequires:  python3-devel
 BuildRequires:  python3-distribute
 BuildRequires:  python3-isodate
 BuildRequires:  python3-nose
 BuildRequires:  python3-xml
-BuildRequires:	fdupes
 Requires:       python3-isodate
 Requires:       python3-xml
 BuildArch:      noarch
@@ -58,10 +59,8 @@ rm -r _build/html/.buildinfo
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
 %fdupes -s build/html
 
-%if 0%{?suse_version} >= 1230
 %check
 python3 setup.py test
-%endif
 
 %files
 %defattr(-,root,root)