diff --git a/0001-Move-pep8-dependency-into-pep8-tox-test.patch b/0001-Move-pep8-dependency-into-pep8-tox-test.patch
new file mode 100644
index 0000000..b200c7f
--- /dev/null
+++ b/0001-Move-pep8-dependency-into-pep8-tox-test.patch
@@ -0,0 +1,40 @@
+From 75ab1c5646902b6569058467c789b14f0e3080d1 Mon Sep 17 00:00:00 2001
+From: Dirk Mueller <dirk@dmllr.de>
+Date: Thu, 13 Feb 2014 12:55:22 +0100
+Subject: [PATCH] Move pep8 dependency into pep8 tox test
+
+The other unit tests do not require pep8
+
+Change-Id: I7ac68bb3ff48a76a6dd3db08a05827831069f141
+---
+ test-requirements.txt | 1 -
+ tox.ini               | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/test-requirements.txt b/test-requirements.txt
+index 85c0039..624f4f9 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -1,6 +1,5 @@
+ nose
+ mock
+ coverage
+-pep8
+ cmd2
+ PrettyTable
+diff --git a/tox.ini b/tox.ini
+index a210ff2..da84351 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -10,7 +10,7 @@ deps =
+     coverage
+ 
+ [testenv:pep8]
+-deps = flake8
++deps = flake8 pep8==1.4.5
+ commands = flake8 cliff docs/source/conf.py setup.py
+ 
+ [testenv:py26]
+-- 
+1.8.4.1
+
diff --git a/python-cliff.changes b/python-cliff.changes
index adc920b..c65bf7e 100644
--- a/python-cliff.changes
+++ b/python-cliff.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb 13 11:53:51 UTC 2014 - dmueller@suse.com
+
+- add 0001-Move-pep8-dependency-into-pep8-tox-test.patch: remove global pep8 dependency 
+
 -------------------------------------------------------------------
 Tue Jan 21 13:22:18 UTC 2014 - dmueller@suse.com
 
diff --git a/python-cliff.spec b/python-cliff.spec
index cf17d9f..f7f88c9 100644
--- a/python-cliff.spec
+++ b/python-cliff.spec
@@ -26,6 +26,7 @@ Group:          Development/Languages/Python
 Source:         http://pypi.python.org/packages/source/c/cliff/cliff-%{version}.tar.gz
 Patch0:         remove-distribute-dep.patch
 Patch1:         0001-Fix-doc-build-with-Python-2.6.x.patch
+Patch2:         0001-Move-pep8-dependency-into-pep8-tox-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-argparse
 BuildRequires:  python-devel
@@ -38,7 +39,6 @@ BuildRequires:  python-coverage
 BuildRequires:  python-mock >= 1.0.1
 BuildRequires:  python-nose
 BuildRequires:  python-pbr
-BuildRequires:  python-pep8
 BuildRequires:  python-pyparsing >= 2.0.1
 BuildRequires:  python-six
 BuildRequires:  python-stevedore
@@ -74,6 +74,7 @@ This package contains documentation files for %{name}.
 %setup -q -n cliff-%{version}
 %patch0
 %patch1 -p1
+%patch2 -p1
 
 %build
 python setup.py build