diff --git a/python-stem.spec b/python-stem.spec
index da362ff..9f3fab4 100644
--- a/python-stem.spec
+++ b/python-stem.spec
@@ -3,7 +3,7 @@
 
 Name:           python-stem
 Version:        1.4.1b
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Python controller library for Tor
 
 Group:          Development/Libraries
@@ -71,20 +71,12 @@ This package contains documentation files for Stem.
 %prep
 %autosetup -n %{pkgname}-1.4.1
 
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif
-
 
 %build
 %py2_build
 %if 0%{?with_python3}
-pushd %{py3dir}
 %py3_build
-popd
 %endif
-
 pushd docs
 %make_build html
 %make_build text
@@ -92,65 +84,43 @@ pushd docs
 popd
 
 %install
-%if 0%{?with_python3}
-pushd %{py3dir}
-%py3_install
-mv %{buildroot}%{_bindir}/tor-prompt %{buildroot}%{_bindir}/python3-tor-prompt
-popd
-%endif
 %py2_install
-mv %{buildroot}%{_bindir}/tor-prompt %{buildroot}%{_bindir}/python2-tor-prompt
-pushd %{buildroot}%{_bindir}
 %if 0%{?with_python3}
-for i in tor-prompt tor-prompt-3 tor-prompt-%{?python3_version}; do
-  ln -s python3-tor-prompt $i
-done
+%py3_install
 %endif
-for i in tor-prompt-2 tor-prompt-%{?python2_version}; do
-  ln -s python2-tor-prompt $i
-done
-popd
-
-mv -f docs/_build/html docs/
-mv -f docs/_build/text docs/
-find docs -name .buildinfo -delete
-install -d %{buildroot}%{_mandir}/man1/
-install -m 0644 docs/_build/man/%{pkgname}.1 %{buildroot}%{_mandir}/man1/
+find docs/_build -name .buildinfo -delete
+install -D -m 0644 docs/_build/man/%{pkgname}.1 %{buildroot}%{_mandir}/man1/%{pkgname}.1
 
 %check
-# Disable checks for now
-#%%{__python2} run_tests.py --unit
-#%%if 0%%{?with_python3}
-#pushd %%{py3dir}
-#%%{__python3} run_tests.py --unit
-#popd
-#%%endif
+%{__python2} run_tests.py --unit
+%if 0%{?with_python3}
+%{__python3} run_tests.py --unit
+%endif
 
 %files -n python2-%{pkgname}
 %license LICENSE
-%{_bindir}/python2-tor-prompt
-%{_bindir}/tor-prompt-2
-%{_bindir}/tor-prompt-%{?python2_version}
 %{python2_sitelib}/%{pkgname}
 %{python2_sitelib}/%{pkgname}-*.egg-info
 
 %if 0%{?with_python3}
 %files -n python3-%{pkgname}
 %license LICENSE
-%{_bindir}/python3-tor-prompt
 %{_bindir}/tor-prompt
-%{_bindir}/tor-prompt-3
-%{_bindir}/tor-prompt-%{?python3_version}
 %{python3_sitelib}/%{pkgname}
 %{python3_sitelib}/%{pkgname}-*.egg-info
 %endif
 
 %files doc
-%doc docs/html docs/text
+%doc docs/_build/html docs/_build/text
 %license LICENSE
 %{_mandir}/man1/%{pkgname}.1*
 
 %changelog
+* Mon Nov 30 2015 Juan Orti Alcaine <jorti@fedoraproject.org> - 1.4.1b-7
+- Re-enable checks
+- Don't copy source to %%py3dir
+- Leave only python3 version of tor-prompt script
+
 * Wed Nov 25 2015 Juan Orti Alcaine <jorti@fedoraproject.org> - 1.4.1b-6
 - Checks are causing problems. Disable them for now.