diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c084671a2e394d3f6c85a865c182438e88ca1db1..9e828fd150b067f415e4b231f806dd61483037c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,57 +1,62 @@
-test:2.7:
+before_script:
+  - "pip install -r .ci/requirements.txt"
+  - "REQUIREMENTS=$(mktemp) && python setup.py requirements > ${REQUIREMENTS} && pip install -r ${REQUIREMENTS} && rm ${REQUIREMENTS}"
+  - "pip install -r .ci/requirements_modules.txt"
+
+stages:
+  - "build27"
+  - "test27"
+  - "deploy27"
+  - "build3"
+  - "test3"
+  - "deploy3"
+
+build:2.7:
   image: "python:2.7"
+  stage: "build27"
+  script:
+    - "./tools/local_install.sh ~/bin"
 
-  before_script:
-    - "pip install -r .ci/requirements.txt"
-    - "REQUIREMENTS=$(mktemp) && python setup.py requirements > ${REQUIREMENTS} && pip install -r ${REQUIREMENTS} && rm ${REQUIREMENTS}"
-    - "pip install -r .ci/requirements_modules.txt"
-
-  build:
-    stage: "build"
-    script:
-      - "./tools/local_install.sh ~/bin"
-
-  lint:
-    stage: "test"
-    script:
-      - "./tools/pyflakes.sh"
-      - "./tools/weboob_lint.sh"
-
-  unittests:
-    stage: "test"
-    script:
-      - "./tools/run_tests.sh"
-
-  doc:
-    stage: "deploy"
-    script:
-      - "cd ./docs && make html"
-
-test:3:
+lint:2.7:
+  image: "python:2.7"
+  stage: "test27"
+  script:
+    - "./tools/pyflakes.sh"
+    - "./tools/weboob_lint.sh"
+
+unittests:2.7:
+  image: "python:2.7"
+  stage: "test27"
+  script:
+    - "./tools/run_tests.sh"
+
+doc:2.7:
+  image: "python:2.7"
+  stage: "deploy27"
+  script:
+    - "cd ./docs && make html"
+
+build:3:
   image: "python:3"
+  stage: "build3"
+  script:
+    - "./tools/local_install.sh ~/bin"
 
-  before_script:
-    - "pip install -r .ci/requirements.txt"
-    - "REQUIREMENTS=$(mktemp) && python setup.py requirements > ${REQUIREMENTS} && pip install -r ${REQUIREMENTS} && rm ${REQUIREMENTS}"
-    - "pip install -r .ci/requirements_modules.txt"
-
-  build:
-    stage: "build"
-    script:
-      - "./tools/local_install.sh ~/bin"
-
-  lint:
-    stage: "test"
-    script:
-      - "./tools/pyflakes.sh"
-      - "./tools/weboob_lint.sh"
-
-  unittests:
-    stage: "test"
-    script:
-      - "./tools/run_tests.sh -3"
-
-  doc:
-    stage: "deploy"
-    script:
-      - "cd ./docs && make html"
+lint:3:
+  image: "python:3"
+  stage: "test3"
+  script:
+    - "./tools/pyflakes.sh"
+    - "./tools/weboob_lint.sh"
+
+unittests:3:
+  image: "python:3"
+  stage: "test3"
+  script:
+    - "./tools/run_tests.sh -3"
+
+doc:3:
+  image: "python:3"
+  stage: "deploy3"
+  script:
+    - "cd ./docs && make html"