diff --git a/sshtunnel-0.1.3.tar.gz b/0.1.3.tar.gz
similarity index 100%
rename from sshtunnel-0.1.3.tar.gz
rename to 0.1.3.tar.gz
diff --git a/python-sshtunnel.changes b/python-sshtunnel.changes
index d32b10d..33775ba 100644
--- a/python-sshtunnel.changes
+++ b/python-sshtunnel.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed May  9 10:59:26 UTC 2018 - tchvatal@suse.com
+
+- Switch to pytest and run tests directly instead of running them
+  in tox virtual enviroment
+
+-------------------------------------------------------------------
+Wed May  9 10:55:00 UTC 2018 - tchvatal@suse.com
+
+- Use %license to install license
+- Really execute tests
+- Really switch to github url as pypi deployment does not contain
+  the tests
+
 -------------------------------------------------------------------
 Mon May  7 08:23:14 UTC 2018 - adrian.glaubitz@suse.com
 
diff --git a/python-sshtunnel.spec b/python-sshtunnel.spec
index 68ce6cd..0d9997e 100644
--- a/python-sshtunnel.spec
+++ b/python-sshtunnel.spec
@@ -11,7 +11,7 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-#
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -20,20 +20,22 @@
 Name:           python-sshtunnel
 Version:        0.1.3
 Release:        0
-Url:            https://pypi.org/project/sshtunnel/
 Summary:        SSH tunnels to remote server
 License:        MIT
 Group:          Development/Languages/Python
-Source:         https://files.pythonhosted.org/packages/source/s/sshtunnel/sshtunnel-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+URL:            https://pypi.org/project/sshtunnel/
+Source:         https://github.com/pahaz/sshtunnel/archive/%{version}.tar.gz
 BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module paramiko >= 1.15.2}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module tox >= 1.8.1}
+# for the tests to validate some things
 BuildRequires:  fdupes
+BuildRequires:  openssh
 BuildRequires:  python-rpm-macros
+Requires:       openssh
 Requires:       python-paramiko >= 1.15.2
-Requires:       python-tox >= 1.8.1
 BuildArch:      noarch
 %python_subpackages
 
@@ -56,10 +58,8 @@ sed -i '/^#[!]*/d' sshtunnel.py
 %python_clone -a %{buildroot}%{_bindir}/sshtunnel
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%if %{with tests}
 %check
-%python_exec setup.py -q test
-%endif
+%python_expand py.test-%{$python_version}
 
 %post
 %python_install_alternative sshtunnel
@@ -68,7 +68,7 @@ sed -i '/^#[!]*/d' sshtunnel.py
 %python_uninstall_alternative sshtunnel
 
 %files %{python_files}
-%defattr(-,root,root,-)
+%license LICENSE
 %doc *.rst
 %python_alternative %{_bindir}/sshtunnel
 %{python_sitelib}/*