diff --git a/python-argh-0.26.1-fix-testsuite.patch b/python-argh-0.26.1-fix-testsuite.patch
new file mode 100644
index 0000000..d67a0d7
--- /dev/null
+++ b/python-argh-0.26.1-fix-testsuite.patch
@@ -0,0 +1,10 @@
+Index: argh-0.26.1/test/test_integration.py
+===================================================================
+--- argh-0.26.1.orig/test/test_integration.py
++++ argh-0.26.1/test/test_integration.py
+@@ -772,4 +772,4 @@ def test_unknown_args():
+     assert run(p, '--bar 1', exit=True) == 'unrecognized arguments: --bar 1'
+     assert run(p, '--bar 1', exit=False,
+                kwargs={'skip_unknown_args': True}) == \
+-           R(out='usage: py.test [-h] [-f FOO]\n\n', err='')
++           R(out='usage: setup.py [-h] [-f FOO]\n\n', err='')
diff --git a/python-argh.changes b/python-argh.changes
index 8a299f8..088aeea 100644
--- a/python-argh.changes
+++ b/python-argh.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Apr 24 17:32:13 UTC 2017 - toddrme2178@gmail.com
+
+- Fix source URL
+- Various small spec file cleanups.
+
+-------------------------------------------------------------------
+Sun Apr 23 08:19:15 UTC 2017 - aloisio@gmx.com
+
+- Converted to single-spec
+- Added python-argh-0.26.1-fix-testsuite.patch
+- Enabled tests
+
 -------------------------------------------------------------------
 Sun Apr 19 16:29:05 UTC 2015 - benoit.monin@gmx.fr
 
diff --git a/python-argh.spec b/python-argh.spec
index 8469cf5..9d831d0 100644
--- a/python-argh.spec
+++ b/python-argh.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-argh
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,24 +16,31 @@
 #
 
 
+%bcond_without tests
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-argh
 Version:        0.26.1
 Release:        0
-Url:            https://github.com/neithere/argh/
 Summary:        A simple argparse wrapper
 License:        LGPL-3.0+
 Group:          Development/Languages/Python
-Source:         http://pypi.python.org/packages/source/a/argh/argh-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-argparse >= 1.1
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-Requires:       python-argparse >= 1.1
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
-BuildArch:      noarch
+Url:            https://github.com/neithere/argh/
+Source:         https://files.pythonhosted.org/packages/source/a/argh/argh-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE python-argh-0.26.1-fix-testsuite.patch -- so that tests can run on OBS
+Patch0:         python-argh-0.26.1-fix-testsuite.patch
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+# test requirements
+%if %{with tests}
+BuildRequires:  %{python_module mock}
+BuildRequires:  %{python_module pytest}
 %endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
+%python_subpackages
 
 %description
 Agrh, argparse!
@@ -61,16 +68,25 @@ work that a custom dispatcher may not do.
 
 %prep
 %setup -q -n argh-%{version}
+%patch0 -p1
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes -s %{buildroot}%{$python_sitelib}
 
-%files
+%if %{with tests}
+%check
+export LC_CTYPE="en_US.UTF-8"
+%python_exec setup.py test
+%endif
+
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc README.rst
-%{python_sitelib}/*
+%{python_sitelib}/argh/
+%{python_sitelib}/argh-%{version}-py*.egg-info
 
 %changelog