diff --git a/gobject-introspection.changes b/gobject-introspection.changes
index 95eeaa8..fcdc6f5 100644
--- a/gobject-introspection.changes
+++ b/gobject-introspection.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov  2 09:23:23 UTC 2017 - mpluskal@suse.com
+
+- Switch to python3
+- Cleanup with spec-cleaner
+- Run tests during build
+
 -------------------------------------------------------------------
 Wed Oct  4 00:15:15 UTC 2017 - luc14n0@linuxmail.org
 
diff --git a/gobject-introspection.spec b/gobject-introspection.spec
index af27738..0278217 100644
--- a/gobject-introspection.spec
+++ b/gobject-introspection.spec
@@ -38,9 +38,9 @@ BuildRequires:  flex
 BuildRequires:  gtk-doc
 BuildRequires:  libffi-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python-Mako
-BuildRequires:  python-devel >= 2.7
-BuildRequires:  python-xml
+BuildRequires:  python3-Mako
+BuildRequires:  python3-devel
+BuildRequires:  python3-xml
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-gobject)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.54.0
@@ -50,7 +50,7 @@ Requires:       file
 Requires:       libgirepository-1_0-1 = %{version}
 # gi-find-deps uses the enhanced grep variant in order to do multi-line matching (for pkg.requires(..))
 Requires:       pcre-tools
-Requires:       python-xml
+Requires:       python3-xml
 
 %description
 The goal of the project is to describe the APIs and collect them in
@@ -95,10 +95,11 @@ a uniform, machine readable format.
 %setup -q
 
 %build
+export PYTHON="python3"
 %configure \
-        --enable-gtk-doc \
-        --disable-static \
-        --enable-doctool
+  --enable-gtk-doc \
+  --disable-static \
+  --enable-doctool
 make %{?_smp_mflags} V=1
 
 %install
@@ -111,12 +112,13 @@ ls %{buildroot}%{_libdir}/girepository-1.0/*.typelib | sh %{SOURCE1} -P > gobjec
 diff -s %{SOURCE3} gobject-introspection-typelib.installed
 %fdupes %{buildroot}
 
-%post -n libgirepository-1_0-1 -p /sbin/ldconfig
+%check
+make %{?_smp_mflags} check
 
+%post -n libgirepository-1_0-1 -p /sbin/ldconfig
 %postun -n libgirepository-1_0-1 -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc AUTHORS CONTRIBUTORS COPYING COPYING.GPL NEWS README TODO
 %{_bindir}/g-ir-annotation-tool
 %{_bindir}/g-ir-compiler
@@ -145,7 +147,6 @@ diff -s %{SOURCE3} gobject-introspection-typelib.installed
 %{_rpmconfigdir}/fileattrs/gobjectintrospection.attr
 
 %files -n libgirepository-1_0-1
-%defattr(-,root,root)
 %doc COPYING.LGPL
 # We own this directory here instead of devel to make sure other packages do
 # not have to own it
@@ -154,11 +155,9 @@ diff -s %{SOURCE3} gobject-introspection-typelib.installed
 %dir %{_libdir}/girepository-1.0
 
 %files -n girepository-1_0
-%defattr(-,root,root)
 %{_libdir}/girepository-1.0/*.typelib
 
 %files devel
-%defattr(-,root,root)
 %doc %{_datadir}/gtk-doc/html/gi/
 %{_includedir}/gobject-introspection-1.0/
 %{_libdir}/libgirepository-1.0.so