diff --git a/python-mando.changes b/python-mando.changes
index 2ee0136..7ea546c 100644
--- a/python-mando.changes
+++ b/python-mando.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov  6 17:16:46 UTC 2017 - toddrme2178@gmail.com
+
+- Spec file cleanups
+- rpmlint fixes
+
 -------------------------------------------------------------------
 Tue Oct 24 20:13:04 UTC 2017 - aloisio@gmx.com
 
diff --git a/python-mando.spec b/python-mando.spec
index 015459f..43ef0ce 100644
--- a/python-mando.spec
+++ b/python-mando.spec
@@ -13,49 +13,54 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without  test
 Name:           python-mando
 Version:        0.6.4
 Release:        0
-Summary:        Create Python CLI apps with little to no effort at all
 License:        MIT
+Summary:        Create Python CLI apps with little to no effort at all!
+Url:            https://mando.readthedocs.org/
 Group:          Development/Languages/Python
-URL:            https://mando.readthedocs.org/
 Source:         https://files.pythonhosted.org/packages/source/m/mando/mando-%{version}.tar.gz
+BuildRequires:  python-rpm-macros
 BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
-BuildRequires:  python-rpm-macros
-BuildRequires:  python3-Sphinx
+%if %{with test}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module six}
+%endif
 Requires:       python-six
-Recommends:     python-rst2ansi
+Suggests:       python-rst2ansi
 BuildArch:      noarch
+
 %python_subpackages
 
 %description
-Mando is a wrapper around `argparse`, and allows you to
-write complete CLI applications in seconds while
-maintaining all the flexibility.
+Mando is a wrapper around argparse, and allows you to write complete CLI
+applications in seconds while maintaining all the flexibility.
 
 %prep
 %setup -q -n mando-%{version}
-sed -i '1d' mando/tests/capture.py mando/tests/run.py
+sed -i -e '/^#!\//, 1d' mando/tests/*.py
 
 %build
 %python_build
 
 %install
 %python_install
-%python_expand %fdupes -s %{buildroot}%{$python_sitelib}
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
+%if %{with test}
 %check
 %python_exec setup.py test
+%endif
 
 %files %{python_files}
+%defattr(-,root,root,-)
 %doc LICENSE README.rst
 %{python_sitelib}/*