diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 755184e8..bddf887a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,33 @@
 image: ubuntu:xenial
 stages:
   - test
-job_test_base:
+job_test_base_pg_96:
   stage: test
   script:
   - apt-get update && apt-get install -y apt-utils locales git
   - git clone https://gitlab.com/flectra-hq/build-tools.git ${CI_PROJECT_DIR}/build-tools && export PATH=${CI_PROJECT_DIR}/build-tools/gitlab-ci:${PATH}
   - gitlab_ci_install_flectra
   - su - flectra -c "export PATH=${CI_PROJECT_DIR}/build-tools/gitlab-ci:${PATH} && gitlab_test_flectra --build=base"
-job_test_all:
+job_test_all_96:
   stage: test
   script:
   - apt-get update && apt-get install -y apt-utils locales git
   - git clone https://gitlab.com/flectra-hq/build-tools.git ${CI_PROJECT_DIR}/build-tools && export PATH=${CI_PROJECT_DIR}/build-tools/gitlab-ci:${PATH}
   - gitlab_ci_install_flectra
+  - su - flectra -c "export PATH=${CI_PROJECT_DIR}/build-tools/gitlab-ci:${PATH} && gitlab_test_flectra --build=all"
+job_test_base_100:
+  stage: test
+  script:
+  - apt-get update && apt-get install -y apt-utils locales git
+  - export POSTGRESQL_VERSION=10.0
+  - git clone https://gitlab.com/flectra-hq/build-tools.git ${CI_PROJECT_DIR}/build-tools && export PATH=${CI_PROJECT_DIR}/build-tools/gitlab-ci:${PATH}
+  - gitlab_ci_install_flectra
+  - su - flectra -c "export PATH=${CI_PROJECT_DIR}/build-tools/gitlab-ci:${PATH} && gitlab_test_flectra --build=base"
+job_test_all_100:
+  stage: test
+  script:
+  - apt-get update && apt-get install -y apt-utils locales git
+  - export POSTGRESQL_VERSION=10.0
+  - git clone https://gitlab.com/flectra-hq/build-tools.git ${CI_PROJECT_DIR}/build-tools && export PATH=${CI_PROJECT_DIR}/build-tools/gitlab-ci:${PATH}
+  - gitlab_ci_install_flectra
   - su - flectra -c "export PATH=${CI_PROJECT_DIR}/build-tools/gitlab-ci:${PATH} && gitlab_test_flectra --build=all"
\ No newline at end of file