diff --git a/python-kdcproxy.spec b/python-kdcproxy.spec
index fd96e7c..09ad41e 100644
--- a/python-kdcproxy.spec
+++ b/python-kdcproxy.spec
@@ -13,7 +13,7 @@ BuildArch:      noarch
 BuildRequires:  python2-devel
 
 %if 0%{?rhel} == 0
-BuildRequires:  python-tox
+BuildRequires:  /usr/bin/tox
 BuildRequires:  pytest
 BuildRequires:  python-coverage
 BuildRequires:  python-webtest
@@ -68,7 +68,7 @@ find $RPM_BUILD_ROOT%{python3_sitelib}/%{realname}/ -name '*.py' -exec chmod 755
 
 %check
 %if 0%{?rhel} == 0
-tox --sitepackages -e py27,py35
+tox --sitepackages -e py27,py%{python3_version_nodots}
 %endif
 
 %files
@@ -86,6 +86,8 @@ tox --sitepackages -e py27,py35
 %changelog
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.3.2-5
 - Rebuild for Python 3.6
+- BR /usr/bin/tox instead of python-tox
+- Use %%{python3_version_nodots} instead of hardcoded 35
 
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.2-4
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages