diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36b01feabe8f3e7b81dfd103a744c6ca07747a87..124b46dfe56744f0cd879aa95f07bd094ac5cecd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,8 @@ test:
     # TODO: Different jobs with custom develop arguments? extra_requires (hyperspy, plotting)?
     # TODO: Use pip install -e .[hyperspy], etc.
     # Install requirements:
-    - pip install -r requirements.txt  # TODO: Use conda docker image if available!?
+    # - pip install -r requirements.txt  # TODO: DOES NOT WORK (because mayavi and stuff...)
+    - pip install -e .['tests']
     - python setup.py test
     - coverage html
   artifacts:
diff --git a/setup.py b/setup.py
index 7085106f933d91d73349d82475b72212ab402444..d255b8147607dfc9a4f5672a578362875bd1e2cb 100644
--- a/setup.py
+++ b/setup.py
@@ -128,6 +128,7 @@ def get_files(rootdir):
     return filepaths
 
 
+# TODO: Outsource stuff to setup.cfg? See https://github.com/pypa/setuptools/pull/862
 
 # TODO: Use requirements.txt? extras_require for optional stuff (hyperspy, plotting)?
 # TODO: After split of Pyramid, comment out and see what really is used (is e.g. scipy?)!