diff --git a/ansible-newer-jinja.patch b/ansible-newer-jinja.patch
index 47d61e8..08f1773 100644
--- a/ansible-newer-jinja.patch
+++ b/ansible-newer-jinja.patch
@@ -1,11 +1,11 @@
-diff -up ansible-2.0.0.2/setup.py.bak ansible-2.0.0.2/setup.py
---- ansible-2.0.0.2/setup.py.bak	2016-02-04 21:35:01.448634875 -0800
-+++ ansible-2.0.0.2/setup.py	2016-02-04 21:35:21.766665402 -0800
-@@ -22,7 +22,7 @@ setup(name='ansible',
+diff -Nur ansible-2.2.2.0.orig/setup.py ansible-2.2.2.0/setup.py
+--- ansible-2.2.2.0.orig/setup.py	2017-03-27 14:33:16.000000000 -0600
++++ ansible-2.2.2.0/setup.py	2017-03-28 23:20:16.248133620 -0600
+@@ -22,7 +22,7 @@
        license='GPLv3',
        # Ansible will also make use of a system copy of python-six if installed but use a
        # Bundled copy if it's not.
--      install_requires=['paramiko', 'jinja2 < 2.9', "PyYAML", 'setuptools', 'pycrypto >= 2.6'],
+-      install_requires=['paramiko', 'jinja2', "PyYAML", 'setuptools', 'pycrypto >= 2.6'],
 +      install_requires=['paramiko', 'jinja2 >= 2.6, < 2.9', "PyYAML", 'setuptools', 'pycrypto >= 2.6'],
        package_dir={ '': 'lib' },
        packages=find_packages('lib'),
diff --git a/ansible.spec b/ansible.spec
index 3495854..afa5929 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -20,7 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Name: ansible
 Summary: SSH-based configuration management, deployment, and task execution system
 Version: 2.2.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group: Development/Libraries
 License: GPLv3+
@@ -76,12 +76,17 @@ BuildRequires: python-paramiko
 BuildRequires: python-keyczar
 BuildRequires: python-six
 BuildRequires: python-nose
-BuildRequires: python-pytest
 BuildRequires: python-coverage
 BuildRequires: python-mock
 BuildRequires: python-boto3
 BuildRequires: python-botocore
 BuildRequires: python-passlib
+# rhel7 does not have python-pytest but has pytest
+%if 0%{?rhel} > 6
+BuildRequires: pytest
+%else
+BuildRequires: python-pytest
+%endif
 %endif
 
 %if (0%{?rhel} && 0%{?rhel} <= 6)
@@ -275,7 +280,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{python_sitelib}/ansible*
 %{_bindir}/ansible*
+%if 0%{?with_python3}
 %exclude %{_bindir}/ansible*-3*
+%endif  # python3
 %config(noreplace) %{_sysconfdir}/ansible/
 %doc README.md PKG-INFO COPYING CHANGELOG.md
 %doc %{_mandir}/man1/ansible*
@@ -291,6 +298,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif  # python3
 
 %changelog
+* Tue Mar 28 2017 Kevin Fenzi <kevin@scrye.com> - 2.2.2.0-3
+- Deal with RHEL7 pytest vs python-pytest.
+- Rebase epel6 newer jinja patch.
+- Conditionalize exclude for RHEL6 rpm.
+
 * Tue Mar 28 2017 Kevin Fenzi <kevin@scrye.com> - 2.2.2.0-2
 - Conditionalize python3 files for epel builds.