diff --git a/.travis.yml b/.travis.yml
index d7866cb..722a893 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ addons:
       secure: ${SONAR_TOKEN}
 script:
   - python setup.py build install
+  - python setup.py build setup
+  - flake8 osml
   - travis_wait 90 coverage run --source=osml setup.py test
   - coverage xml -o coverage.xml
   - sonar-scanner
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 6428bee..5bfa12d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 setuptools
+flake8
 pytest
 coverage
 numpy
diff --git a/setup.cfg b/setup.cfg
index 39920d8..1ef0427 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,4 +4,10 @@ test = pytest
 [tool:pytest]
 addopts = --verbose
 python_files = tests/*/test_*.py
-python_functions = test_*
\ No newline at end of file
+python_functions = test_*
+
+[flake8]
+max-line-length = 120
+
+[pep8]
+max-line-length = 120
\ No newline at end of file
diff --git a/setup.py b/setup.py
index a4b4262..cd96774 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 install_requires = ['numpy', 'pandas']
 
-setup_requires = ['pytest-runner']
+setup_requires = ['pytest-runner', 'flake8']
 
 test_requires = ['pytest', 'coverage', 'scipy', 'sklearn']