diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f264f53c51d9ee65e528991f34c6d33cbbea3f8..ce17e5f965a9f1487742ecdef68741f97439916c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,8 +34,6 @@ tests:
         - conda install -c conda-forge tox-conda
     script:
         - xvfb-run tox -v --recreate
-# TODO: run docs and coverage seperately since they require make and graphviz
-        - xvfb-run tox -e docs,coverage -v --recreate
 
 build_and_deploy_docs:
     image: "python:latest"
diff --git a/tox.ini b/tox.ini
index 1b2fd945bc2afcebf0a01b61a9d83e8daac3bbce..4b08482f5bfe5d141ddae0c2a755381c24ee4459 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ commands =
     flake8 flatland tests examples benchmarks
 
 [testenv:docs]
-; TODO docs requires make and graphviz installed, therefore exclude Windows
+; TODO https://gitlab.aicrowd.com/flatland/flatland/issues/33 docs requires make installed, therefore exclude Windows
 platform = linux|linux2|darwin
 ; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
 basepython = python3.6
@@ -46,7 +46,7 @@ commands =
     make docs
 
 [testenv:coverage]
-; TODO coverage requires make, therefore exclude Windows
+; TODO https://gitlab.aicrowd.com/flatland/flatland/issues/33 coverage requires make, therefore exclude Windows
 platform = linux|linux2|darwin
 ; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
 basepython = python3.6
@@ -114,6 +114,7 @@ commands =
     python benchmarks/profile_all_examples.py
 
 [testenv:examples]
+; TODO should examples be run with py36 and py37??
 ; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
 basepython = python3.6
 setenv =
@@ -139,6 +140,7 @@ commands =
     python {toxinidir}/benchmarks/run_all_examples.py
 
 [testenv:notebooks]
+; TODO should examples be run with py36 and py37??
 ; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
 basepython = python3.6
 setenv =