diff --git a/docker/test-py3.sh b/docker/test-py3.sh
index 4b427d74..27241f79 100755
--- a/docker/test-py3.sh
+++ b/docker/test-py3.sh
@@ -22,4 +22,4 @@ sed -i \
 
 # Since tox seems to ignore `usedevelop` when we have `sitepackages` on, we have to run it manually
 python3 setup.py develop --no-deps
-/usr/bin/tox -e flake8,py3 "$@"
+/usr/bin/tox -e flake8,py3,intflake "$@"
diff --git a/tox.ini b/tox.ini
index 965f46bb..58cb3daf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,17 +4,12 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = flake8, py27, py3
+envlist = flake8, intflake, py27, py3
 
 [flake8]
 ignore = E731,W503
 max-line-length = 100
-exclude =
-    ./.tox
-    ./.git
-    ./module_build_service/migrations
-    ./build
-    ./.env
+exclude = .tox,.git,module_build_service/migrations,build,.env
 
 [testenv]
 usedevelop = true
@@ -49,7 +44,16 @@ commands =
 basepython = python2
 skip_install = true
 deps = flake8
-commands = flake8
+# doing this until --extend-exclude support becomes available
+# https://flake8.readthedocs.io/en/latest/user/options.html#cmdoption-flake8-extend-exclude
+commands = flake8 --exclude={[flake8]exclude},tests/integration
+
+[testenv:intflake]
+basepython = python3
+skip_install = true
+sitepackages = false
+deps = flake8
+commands = flake8 tests/integration
 
 [testenv:bandit]
 basepython = python2