diff --git a/pull-request-91.patch b/pull-request-91.patch
new file mode 100644
index 0000000..8711330
--- /dev/null
+++ b/pull-request-91.patch
@@ -0,0 +1,23 @@
+From b45975931bba9808fe88f6931fcdeeb3d201cda8 Mon Sep 17 00:00:00 2001
+From: Ryan Petrello <lists@ryanpetrello.com>
+Date: Mon, 7 Aug 2017 22:19:49 -0400
+Subject: [PATCH] fix broken py36 tests
+
+---
+ .travis.yml              | 6 ++++--
+ pecan/tests/test_conf.py | 2 +-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+Index: pecan-1.2.1/pecan/tests/test_conf.py
+===================================================================
+--- pecan-1.2.1.orig/pecan/tests/test_conf.py
++++ pecan-1.2.1/pecan/tests/test_conf.py
+@@ -157,7 +157,7 @@ class TestConf(PecanTestCase):
+ 
+             try:
+                 configuration.conf_from_file(f.name)
+-            except (ValueError, SystemError) as e:
++            except (ValueError, SystemError, ImportError) as e:
+                 assert 'relative import' in str(e)
+             else:
+                 raise AssertionError(
diff --git a/python-pecan.changes b/python-pecan.changes
index 7c63c45..b902536 100644
--- a/python-pecan.changes
+++ b/python-pecan.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 24 15:31:13 UTC 2017 - tbechtold@suse.com
+
+- Add pull-request-91.patch . That fixes the tests for python3.6
+
 -------------------------------------------------------------------
 Wed Jul 12 06:00:37 UTC 2017 - tbechtold@suse.com
 
diff --git a/python-pecan.spec b/python-pecan.spec
index 383c20b..ea1e450 100644
--- a/python-pecan.spec
+++ b/python-pecan.spec
@@ -25,6 +25,8 @@ License:        BSD-3-Clause
 Group:          Development/Languages/Python
 Url:            http://github.com/dreamhost/pecan
 Source:         https://files.pythonhosted.org/packages/source/p/pecan/pecan-%{version}.tar.gz
+# # PATCH-FIX-UPSTREAM pull-request-91.patch -- https://github.com/pecan/pecan/pull/91
+Patch1:         pull-request-91.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  python-rpm-macros
@@ -70,6 +72,7 @@ A WSGI object-dispatching web framework, designed to be lean and fast with few d
 %setup -q -n pecan-%{version}
 # Let's not depend on Kajiki, a Genshi clone. Genshi should be enough:
 sed -i "/'Kajiki',/d" setup.py
+%patch1 -p1
 
 %build
 %python_build