diff --git a/.travis.yml b/.travis.yml
index a7f9cda45..01fb25d8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,5 +3,6 @@ python:
   - "2.7"
 install:
   - pip install -r requirements.txt
+  - pip install pep8
 script:
   - ./scripts/cibuild.sh
diff --git a/scripts/cibuild.sh b/scripts/cibuild.sh
index b3f50152e..4f4fe1ca3 100755
--- a/scripts/cibuild.sh
+++ b/scripts/cibuild.sh
@@ -21,6 +21,16 @@ if [[ ! -z $SYNTAX ]]; then
 	EXIT=1
 fi
 
+# Check all python source files for PEP 8 compliance, but explicitly
+# ignore:
+#  - E501: line greater than 80 characters in length
+pep8 --ignore=E501 netbox/
+RC=$?
+if [[ $RC != 0 ]]; then
+	echo -e "\n$(info) one or more PEP 8 errors detected, failing build."
+	EXIT=$RC
+fi
+
 # Prepare configuration file for use in CI
 CONFIG="netbox/netbox/configuration.py"
 cp netbox/netbox/configuration.example.py $CONFIG