diff --git a/systemvm/test/python/TestCsApp.py b/systemvm/test/python/TestCsApp.py
index 14308e6a309..d5d9e90fb08 100644
--- a/systemvm/test/python/TestCsApp.py
+++ b/systemvm/test/python/TestCsApp.py
@@ -13,7 +13,7 @@ class TestCsApp(unittest.TestCase):
     def test_init(self):
         csconfig = CsConfig()
         csconfig.set_cl()
-        csip = CsIP("eth0", csconfig);
+        csip = CsIP("eth0", csconfig)
         csapp = CsApp(csip)
         self.assertTrue(csapp is not None)
 
diff --git a/systemvm/test/python/TestCsDhcp.py b/systemvm/test/python/TestCsDhcp.py
index fbe5000f91a..b96eefb852b 100644
--- a/systemvm/test/python/TestCsDhcp.py
+++ b/systemvm/test/python/TestCsDhcp.py
@@ -1,5 +1,5 @@
 import unittest
-import mock 
+import mock
 from cs.CsDhcp import CsDhcp
 from cs import CsHelper
 import merge
diff --git a/systemvm/test/python/TestCsRoute.py b/systemvm/test/python/TestCsRoute.py
index c422402b03c..1c9f8a3e627 100644
--- a/systemvm/test/python/TestCsRoute.py
+++ b/systemvm/test/python/TestCsRoute.py
@@ -9,7 +9,7 @@ class TestCsRoute(unittest.TestCase):
         merge.DataBag.DPATH = "."
 
     def test_init(self):
-        csroute = CsRoute(["one","two","three","four"])
+        csroute = CsRoute(["one", "two", "three", "four"])
         self.assertTrue(csroute is not None)
 
 if __name__ == '__main__':
diff --git a/systemvm/test/python/runtests.sh b/systemvm/test/python/runtests.sh
index be090b3d970..0442e4c2082 100644
--- a/systemvm/test/python/runtests.sh
+++ b/systemvm/test/python/runtests.sh
@@ -5,4 +5,7 @@
 export PYTHONPATH="../../patches/debian/config/opt/cloud/bin/"
 export PYTHONDONTWRITEBYTECODE=False
 
+pep8 --max-line-length=179 --exclude=monitorServices.py,baremetal-vr.py `find ../../patches -name \*.py`
+pep8 --max-line-length=179 *py
+
 nosetests .