diff --git a/.ci/integration.sh b/.ci/integration.sh
new file mode 100755
index 0000000..3bb530a
--- /dev/null
+++ b/.ci/integration.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# failure is a natural part of life
+set -e
+
+# build the package
+python setup.py install
+
+echo "Checking code for style problems..."
+
+    pycodestyle \
+        --show-pep8 \
+        --show-source \
+        --verbose \
+        $(pwd)
+
+echo "Done checking code for style problems."
+
+echo "Running integration tests ..."
+
+python -m pytest
+
+echo "Done runnning integration tests."
diff --git a/.travis.yml b/.travis.yml
index 270cc07..26d2655 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,8 @@ install:
 script:
   # Install libraries only needed by tests
   - pip install requests
+  - pip install pycodestyle
   # Run tests
-  - python -m pytest
+  - sh .ci/integration.sh
 after_success:
   - echo "tests passed"
diff --git a/integration.sh b/integration.sh
deleted file mode 100755
index 4cfa826..0000000
--- a/integration.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# failure is a natural part of life
-set -e
-
-# build the package
-python setup.py install
-
-# run tests
-python -m pytest
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..c178190
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,2 @@
+[pycodestyle]
+ignore = E501