diff --git a/python-testtools-doc.changes b/python-testtools-doc.changes
index 6327f1c..78f6d7e 100644
--- a/python-testtools-doc.changes
+++ b/python-testtools-doc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 14 16:41:39 UTC 2017 - toddrme2178@gmail.com
+
+- Use singlespec macros where possible to simplify spec file.
+
 -------------------------------------------------------------------
 Sat Apr  8 19:29:56 UTC 2017 - toddrme2178@gmail.com
 
diff --git a/python-testtools-doc.spec b/python-testtools-doc.spec
index a80ccba..37636df 100644
--- a/python-testtools-doc.spec
+++ b/python-testtools-doc.spec
@@ -16,6 +16,7 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-testtools-doc
 Version:        2.2.0
 Release:        0
@@ -24,14 +25,12 @@ License:        MIT
 Group:          Documentation/HTML
 Url:            https://launchpad.net/testtools
 Source:         https://pypi.io/packages/source/t/testtools/testtools-%{version}.tar.gz
-BuildRequires:  python-testtools = %{version}
-BuildRequires:  python3-testtools = %{version}
+BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module testtools  = %{version}}
 %if %{with tests}
 # Test requirement
-BuildRequires:  python-testscenarios
-BuildRequires:  python3-testscenarios
-BuildRequires:  python-unittest2 >= 0.8.0
-BuildRequires:  python3-unittest2 >= 0.8.0
+BuildRequires:  %{python_module testscenarios  = %{version}}
+BuildRequires:  %{python_module unittest2 >= 0.8.0}
 %endif
 # Documentation requirements:
 BuildRequires:  fdupes
@@ -59,8 +58,7 @@ cp -r build/sphinx/html %{buildroot}%{_docdir}/python-testtools/
 # Doing the tests in a separate package avoids this cycle.
 %if %{with tests}
 %check
-python2 -m testtools.run testtools.tests.test_suite
-python3 -m testtools.run testtools.tests.test_suite
+%{python_exec} -m testtools.run testtools.tests.test_suite
 %endif
 
 %files
diff --git a/python-testtools.changes b/python-testtools.changes
index 6327f1c..a1daae8 100644
--- a/python-testtools.changes
+++ b/python-testtools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 14 16:39:38 UTC 2017 - toddrme2178@gmail.com
+
+- Change fixtures dependency to "Recommends". It is not a hard
+  dependency becauses it causes dependency loops.
+
 -------------------------------------------------------------------
 Sat Apr  8 19:29:56 UTC 2017 - toddrme2178@gmail.com
 
diff --git a/python-testtools.spec b/python-testtools.spec
index e0052a6..e92f075 100644
--- a/python-testtools.spec
+++ b/python-testtools.spec
@@ -32,12 +32,12 @@ BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module pbr}
 BuildRequires:  %{python_module extras >= 1.0.0}
 Requires:       python-extras >= 1.0.0
-Requires:       python-fixtures >= 1.3.0
 Requires:       python-pbr >= 0.11
 Requires:       python-python-mimeparse
 Requires:       python-six >= 1.4.0
 Requires:       python-traceback2
 Requires:       python-unittest2 >= 1.0.0
+Recommends:     python-fixtures >= 1.3.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %python_subpackages