diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7ef3384d2e3dd3ea1d0ac96188b21777711d64f..cd076ea4182573382bb0ac12a65aa10070e8437e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,4 +94,127 @@ wheels_linux_27:
     - build_linux_27
   tags:
     - conda-linux
+    
 
+# Linux + Python 3.4: Builds and tests
+build_linux_34:
+  <<: *build_job
+  variables: &linux_34_build_variables
+    PYTHON_VERSION: "3.4"
+  tags:
+    - conda-linux
+
+test_linux_34:
+  <<: *test_job
+  variables: *linux_34_build_variables
+  dependencies:
+    - build_linux_34
+  tags:
+    - conda-linux
+
+wheels_linux_34:
+  <<: *wheels_job
+  variables: *linux_34_build_variables
+  dependencies:
+    - build_linux_34
+  tags:
+    - conda-linux
+
+
+# Linux + Python 3.5: Builds, tests and uploads wheel
+build_linux_35:
+  <<: *build_job
+  variables: &linux_35_build_variables
+    PYTHON_VERSION: "3.5"
+  tags:
+    - conda-linux
+
+test_linux_35:
+  <<: *test_job
+  variables: *linux_35_build_variables
+  dependencies:
+    - build_linux_35
+  tags:
+    - conda-linux
+
+wheels_linux_35:
+  <<: *wheels_job
+  variables: *linux_35_build_variables
+  dependencies:
+    - build_linux_35
+  tags:
+    - conda-linux
+
+# Mac OSX + Python 2.7: Builds and tests
+build_macosx_27:
+  <<: *build_job
+  variables: &macosx_27_build_variables
+    PYTHON_VERSION: "2.7"
+  tags:
+    - conda-macosx
+
+test_macosx_27:
+  <<: *test_job
+  variables: *macosx_27_build_variables
+  dependencies:
+    - build_macosx_27
+  tags:
+    - conda-macosx
+
+wheels_macosx_27:
+  <<: *wheels_job
+  variables: *macosx_27_build_variables
+  dependencies:
+    - build_macosx_27
+  tags:
+    - conda-macosx
+
+
+# Mac OSX + Python 3.4: Builds and tests
+build_macosx_34:
+  <<: *build_job
+  variables: &macosx_34_build_variables
+    PYTHON_VERSION: "3.4"
+  tags:
+    - conda-macosx
+
+test_macosx_34:
+  <<: *test_job
+  variables: *macosx_34_build_variables
+  dependencies:
+    - build_macosx_34
+  tags:
+    - conda-macosx
+
+wheels_macosx_34:
+  <<: *wheels_job
+  variables: *macosx_34_build_variables
+  dependencies:
+    - build_macosx_34
+  tags:
+    - conda-macosx
+
+
+# Mac OSX + Python 3.5: Builds and tests
+build_macosx_35:
+  <<: *build_job
+  variables: &macosx_35_build_variables
+    PYTHON_VERSION: "3.5"
+  tags:
+    - conda-macosx
+
+test_macosx_35:
+  <<: *test_job
+  variables: *macosx_35_build_variables
+  dependencies:
+    - build_macosx_35
+  tags:
+    - conda-macosx
+
+wheels_macosx_35:
+  <<: *wheels_job
+  variables: *macosx_35_build_variables
+  dependencies:
+    - build_macosx_35
+  tags:
+    - conda-macosx
diff --git a/requirements-bob.txt b/requirements-bob.txt
index 48df22fa17740939c364a01278d478474b33e61c..78ac12c544c2900371c606f206cd910f0f13ba98 100644
--- a/requirements-bob.txt
+++ b/requirements-bob.txt
@@ -29,4 +29,4 @@ bob.db.iris
 bob.db.mnist
 bob.db.wine
 bob.db.atnt
-bob.db.arface
\ No newline at end of file
+bob.db.arface
diff --git a/requirements-satellites.txt b/requirements-satellites.txt
index 9e36e4a7dc86c43962a1c6691f2db2d4ec898430..0d5f4a33c401358010551e6e756721683a640803 100644
--- a/requirements-satellites.txt
+++ b/requirements-satellites.txt
@@ -30,4 +30,4 @@ bob.db.asvspoof
 bob.db.kboc16
 bob.db.putvein
 bob.db.ijba
-bob.db.cuhk_cufs
\ No newline at end of file
+bob.db.cuhk_cufs