diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed6f560596b1efc39eecaf06e4009b69ab193b61..1f95f1aebd6e79d722e45c9af99392cb082f807a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,9 @@ variables:
 
 stages:
   - test-perl
+  - test-php
   - test-php-jessie
   - test-php-stretch
-  - test-php
   - test-manpages
   - transifex
 
@@ -40,23 +40,6 @@ create_perl_lint_rapport:
   script:
     - perl -cW contrib/bin/fusiondirectory-setup contrib/bin/fusiondirectory-insert-schema
 
-# generate man pages to test validity
-test_manpages:
-  stage: test-manpages
-  only:
-    - branches
-    - tags
-  before_script:
-  - apt-get update -qq
-  - apt-get install -y -qq perl man-db
-  script:
-    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-insert-schema contrib/man/fusiondirectory-insert-schema.1
-    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-setup contrib/man/fusiondirectory-setup.1
-    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/man/fusiondirectory.conf.pod contrib/man/fusiondirectory.conf.5
-    - lexgrog contrib/man/fusiondirectory-insert-schema.1
-    - lexgrog contrib/man/fusiondirectory-setup.1
-    - lexgrog contrib/man/fusiondirectory.conf.5
-
 # PHP codesniffer
 create_php_code_sniffer_rapport:
   stage: test-php
@@ -72,7 +55,7 @@ create_php_code_sniffer_rapport:
     - phpcs --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist
 
 # PHP lint (jessie)
-create_php_lint_rapport:
+create_php_lint_rapport_jessie:
   image: 5.6.33-cli-jessie
   stage: test-php-jessie
   only:
@@ -82,7 +65,7 @@ create_php_lint_rapport:
     - find . -type f -name '*.php' -o -name '*.inc' -print0 | xargs -0 -n1 php -l
 
 # PHP lint (stretch)
-create_php_lint_rapport:
+create_php_lint_rapport_stretch:
   image: 5.6.33-cli-stretch
   stage: test-php-stretch
   only:
@@ -91,6 +74,23 @@ create_php_lint_rapport:
   script:
     - find . -type f -name '*.php' -o -name '*.inc' -print0 | xargs -0 -n1 php -l
 
+# generate man pages to test validity
+test_manpages:
+  stage: test-manpages
+  only:
+    - branches
+    - tags
+  before_script:
+  - apt-get update -qq
+  - apt-get install -y -qq perl man-db
+  script:
+    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-insert-schema contrib/man/fusiondirectory-insert-schema.1
+    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-setup contrib/man/fusiondirectory-setup.1
+    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/man/fusiondirectory.conf.pod contrib/man/fusiondirectory.conf.5
+    - lexgrog contrib/man/fusiondirectory-insert-schema.1
+    - lexgrog contrib/man/fusiondirectory-setup.1
+    - lexgrog contrib/man/fusiondirectory.conf.5
+
 # fusiondirectory-update-locale
 fusiondirectory-update-locale:
   stage: transifex