diff --git a/mod_auth_gssapi.spec b/mod_auth_gssapi.spec
index 1a5009a..c80c4f5 100644
--- a/mod_auth_gssapi.spec
+++ b/mod_auth_gssapi.spec
@@ -1,6 +1,6 @@
 Name:           mod_auth_gssapi
 Version:        1.6.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A GSSAPI Authentication module for Apache
 
 License:        MIT
@@ -10,6 +10,7 @@ Source0:        https://github.com/modauthgssapi/%{name}/releases/download/v%{ve
 Patch0: In-tests-show-the-exception-on-failure.patch
 Patch1: Fix-tests-to-work-with-python3.patch
 Patch2: Fix-integer-sizes-used-with-ap_set_flag_slot.patch
+Patch3: tests-Test-suite-fixes-for-virtualenv-and-clang.patch
 
 BuildRequires:  httpd-devel, krb5-devel, openssl-devel, autoconf, automake, libtool
 BuildRequires:  gssntlmssp-devel
@@ -47,6 +48,9 @@ install -m 644 10-auth_gssapi.conf %{buildroot}%{_httpd_modconfdir}
 %{_httpd_moddir}/mod_auth_gssapi.so
 
 %changelog
+* Mon Mar 18 2019 Robbie Harwood <rharwood@redhat.com> - 1.6.1-6
+- Test suite fixes for virtualenv and clang
+
 * Tue Feb 19 2019 Robbie Harwood <rharwood@redhat.com> - 1.6.1-5
 - Fix integer sizes used with ap_set_flag_slot()
 - Resolves: #1678872
diff --git a/tests-Test-suite-fixes-for-virtualenv-and-clang.patch b/tests-Test-suite-fixes-for-virtualenv-and-clang.patch
new file mode 100644
index 0000000..d7a4d63
--- /dev/null
+++ b/tests-Test-suite-fixes-for-virtualenv-and-clang.patch
@@ -0,0 +1,39 @@
+From 11c966cc630393e322ef6b88df91d16247bbfc37 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Mon, 11 Mar 2019 14:56:31 -0400
+Subject: [PATCH] [tests] Test suite fixes for virtualenv and clang
+
+- Typo fix - VIRTUAL_ENV in magtests.py
+- testenv object manipulation fix in magtests.py
+- Work around -fstack-clash-protection problems in clang
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+(cherry picked from commit 6aa0a5bfe9d60a50cf36c561268c5d7c1fdb2f0e)
+[rharwood@redhat.com: drop Travis goo]
+---
+ tests/magtests.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tests/magtests.py b/tests/magtests.py
+index f14f47a..a4842a0 100755
+--- a/tests/magtests.py
++++ b/tests/magtests.py
+@@ -687,7 +687,7 @@ if __name__ == '__main__':
+ 
+         # support virtualenv
+         testenv['PATH'] = os.environ.get('PATH', '')
+-        testenv['ViRTUAL_ENV'] = os.environ.get('VIRTUAL_ENV', '')
++        testenv['VIRTUAL_ENV'] = os.environ.get('VIRTUAL_ENV', '')
+ 
+         testenv['DELEGCCACHE'] = os.path.join(testdir, 'httpd',
+                                               USR_NAME + '@' + TESTREALM)
+@@ -716,6 +716,9 @@ if __name__ == '__main__':
+                    'MAG_USER_NAME_2': USR_NAME_2,
+                    'MAG_USER_PASSWORD_2': USR_PWD_2}
+         testenv.update(kdcenv)
++        testenv['PATH'] = os.environ.get('PATH', '')
++        testenv['VIRTUAL_ENV'] = os.environ.get('VIRTUAL_ENV', '')
++
+         errs += test_basic_auth_krb5(testdir, testenv, logfile)
+ 
+         errs += test_no_negotiate(testdir, testenv, logfile)