diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51c5ef8..4d33df4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ static_python:
   before_script:
     - pip install "$GITLAB_CI_PYPI_TOX"
   script:
-    - tox -e flake8
+    - tox -e py2-flake8
 docs:
   stage: build
   image: ${GITLAB_CI_IMAGE_PYTHON3}
@@ -69,7 +69,7 @@ test:
     - apt-get update
     - apt-get install -y ruby-sass
   script:
-    - tox -e deps,pytest
+    - tox -e deps,py2-pytest
 docker:
   stage: deploy
   image: ${GITLAB_CI_IMAGE_DOCKER}
diff --git a/tox.ini b/tox.ini
index 4401a38..59b153f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,11 @@
 [tox]
-envlist =
-    flake8
-    pytest
-    docs
-    py27
-    py36
+envlist = py2-flake8,{py2,py3}-build,py2-pytest,docs
 
 [depversions]
 flake8 = 3.7.7
 sphinx_rtd_theme = 0.4.3
 
-[testenv:flake8]
+[testenv:py2-flake8]
 deps =
     flake8=={[depversions]flake8}
 skip_install = True
@@ -19,6 +14,16 @@ commands = flake8 \
     network \
     auth0login
 
+[testenv:py2-build]
+skip_install = True
+commands =
+    python setup.py sdist bdist_wheel
+
+[testenv:py3-build]
+skip_install = True
+commands =
+    python setup.py sdist bdist_wheel
+
 [testenv:docs]
 deps =
     sphinx_rtd_theme=={[depversions]sphinx_rtd_theme}
@@ -34,7 +39,7 @@ deps =
 extras = dev
 commands = pip check
 
-[testenv:pytest]
+[testenv:py2-pytest]
 install_command = python -m pip install --no-deps {opts} {packages}
 deps =
     -rrequirements-dev.txt