diff --git a/python-cmd2.spec b/python-cmd2.spec
index 3addb46..dcead14 100644
--- a/python-cmd2.spec
+++ b/python-cmd2.spec
@@ -24,7 +24,7 @@ Release:        0
 Summary:        Extra features for standard library's cmd module
 License:        MIT
 Group:          Development/Languages/Python
-Url:            http://packages.python.org/cmd2/
+URL:            https://github.com/python-cmd2/cmd2
 Source:         https://files.pythonhosted.org/packages/source/c/cmd2/cmd2-%{version}.tar.gz
 BuildRequires:  %{python_module contextlib2}
 BuildRequires:  %{python_module mock}
@@ -35,16 +35,27 @@ BuildRequires:  %{python_module wcwidth}
 BuildRequires:  python-enum34
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-subprocess32
+# SECTION Test requirements
+BuildRequires:  %{python_module attrs >= 16.3.0}
+BuildRequires:  %{python_module colorama >= 0.3.7}
+BuildRequires:  %{python_module mock}
+BuildRequires:  %{python_module pyperclip >= 1.6}
+BuildRequires:  %{python_module pytest-mock}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module wcwidth >= 0.1.7}
+# Required by tests.
+BuildRequires:  vim
+%if 0%{?suse_version} <= 1315
+BuildRequires:  %{python_module contextlib2}
+BuildRequires:  %{python_module typing}
+Requires:       python-enum34
+Requires:       python-subprocess32
+%endif
+# /SECTION
 Requires:       python-pyparsing >= 2.0.1
 Requires:       python-pyperclip
 Requires:       python-six
 Requires:       python-wcwidth
-%ifpython2
-Requires:       python-contextlib2
-Requires:       python-enum34
-Requires:       python-subprocess32
-%endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %python_subpackages
@@ -76,13 +87,14 @@ Drop-in replacement adds several features for command-prompt tools:
 
 %install
 %python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%python_exec setup.py test
+%pytest
 
 %files %{python_files}
 %license LICENSE
-%doc README.md
-%{python_sitelib}/*
+%doc CHANGELOG.md README.md
+%{python3_sitelib}/*
 
 %changelog