diff --git a/python-sphinxcontrib-programoutput.changes b/python-sphinxcontrib-programoutput.changes
index 1ae8aa5..4b84ee4 100644
--- a/python-sphinxcontrib-programoutput.changes
+++ b/python-sphinxcontrib-programoutput.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Sep 18 22:29:06 UTC 2017 - toddrme2178@gmail.com
+
+- Use new python-sphinxcontrib package to provide namespace
+  directory.
+
+-------------------------------------------------------------------
+Mon Sep 18 20:36:57 UTC 2017 - toddrme2178@gmail.com
+
+- Specify files to guarantee namespace package doesn't conflict
+  with python(2|3)-Sphinx
+
 -------------------------------------------------------------------
 Mon Apr 24 13:50:12 UTC 2017 - sebix+novell.com@sebix.at
 
diff --git a/python-sphinxcontrib-programoutput.spec b/python-sphinxcontrib-programoutput.spec
index 44e619d..8134747 100644
--- a/python-sphinxcontrib-programoutput.spec
+++ b/python-sphinxcontrib-programoutput.spec
@@ -17,6 +17,7 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_with     test
 Name:           python-sphinxcontrib-programoutput
 Version:        0.10
 Release:        0
@@ -25,12 +26,17 @@ License:        BSD-2-Clause
 Group:          Development/Languages/Python
 Url:            http://sphinxcontrib-programoutput.readthedocs.org/
 Source:         https://files.pythonhosted.org/packages/source/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-%{version}.tar.gz
-BuildRequires:  %{python_module Sphinx}
 BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module sphinxcontrib}
+BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+%if %{with test}
+BuildRequires:  %{python_module Sphinx}
+BuildRequires:  %{python_module pytest}
+%endif
 Requires:       python-Sphinx
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires:       python-sphinxcontrib
 BuildArch:      noarch
 
 %python_subpackages
@@ -47,14 +53,21 @@ documents, helping you to keep your command examples up to date.
 
 %install
 %python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-#NOTE(saschpe): Running tests works but there's an UTF-8 issue I don't yet care about:
-#%%check
-#PYTHONPATH=%%{buildroot}%%{python_sitelib} py.test
+%if %{with test}
+%check
+export LANG=en_US.UTF-8
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
+py.test-%{$python_bin_suffix}
+}
+%endif
 
 %files %{python_files}
 %defattr(-,root,root,-)
 %doc CHANGES.rst LICENSE README.rst
-%{python_sitelib}/*
+%{python_sitelib}/sphinxcontrib/programoutput/
+%{python_sitelib}/sphinxcontrib_programoutput-%{version}-py*-nspkg.pth
+%{python_sitelib}/sphinxcontrib_programoutput-%{version}-py*.egg-info
 
 %changelog