diff --git a/.travis.yml b/.travis.yml
index 2c2fe62d3f4..26946424096 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,34 @@ sudo: required
 git:
   depth: 3
 env:
+  matrix:
+  PACKAGES_MATRIX
+
+compiler: clang
+install:
+  - echo "$PWD"
+  - if [ -n "$TRAVIS_PULL_REQUEST_BRANCH" ] && [ "$PACKAGE" != CHECK ]; then  DO_IGNORE=FALSE;  for ARG in $(echo "$PACKAGE");do if [ "$ARG" = "Maintenance" ]; then continue; fi; . $PWD/.travis/test_package.sh "$PWD" "$ARG";  echo "DO_IGNORE is $DO_IGNORE";  if [ "$DO_IGNORE" = "FALSE" ]; then  break; fi; done; if [ "$DO_IGNORE" = "TRUE" ]; then travis_terminate 0; fi;fi
+  - /usr/bin/time -f 'Spend time of %C -- %E (real)' bash .travis/install.sh
+  - export CXX=clang++ CC=clang;
+before_script:
+  - wget -O doxygen_exe https://cgal.geometryfactory.com/~mgimeno/doxygen_exe
+  - sudo mv doxygen_exe /usr/bin/doxygen
+  - sudo chmod +x /usr/bin/doxygen
+  - mkdir -p build
+  - cd build
+  - /usr/bin/time -f 'Spend time of %C -- %E (real)' cmake -DCMAKE_CXX_FLAGS="-std=c++1y" -DCGAL_HEADER_ONLY=ON -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG -DWITH_examples=ON -DWITH_demos=ON -DWITH_tests=ON ..
+  - /usr/bin/time -f 'Spend time of %C -- %E (real)' make
+  - /usr/bin/time -f 'Spend time of %C -- %E (real)' sudo make install &>/dev/null
+  - cd ..
+script:
+  - cd ./.travis
+  - /usr/bin/time -f 'Spend time of %C -- %E (real)' bash ./build_package.sh $PACKAGE
+notifications:
+  email:
+    on_success: change
+    # default: always
+    on_failure: always
+    # default: always
   matrix:
     - PACKAGE='CHECK'
     - PACKAGE='AABB_tree Advancing_front_surface_reconstruction Algebraic_foundations '
@@ -53,28 +81,3 @@ env:
     - PACKAGE='Three Triangulation Triangulation_2 '
     - PACKAGE='Triangulation_3 Union_find Visibility_2 '
     - PACKAGE='Voronoi_diagram_2 wininst '
-compiler: clang
-install:
-  - echo "$PWD"
-  - if [ -n "$TRAVIS_PULL_REQUEST_BRANCH" ] && [ "$PACKAGE" != CHECK ]; then  DO_IGNORE=FALSE;  for ARG in $(echo "$PACKAGE");do if [ "$ARG" = "Maintenance" ]; then continue; fi; . $PWD/.travis/test_package.sh "$PWD" "$ARG";  echo "DO_IGNORE is $DO_IGNORE";  if [ "$DO_IGNORE" = "FALSE" ]; then  break; fi; done; if [ "$DO_IGNORE" = "TRUE" ]; then travis_terminate 0; fi;fi
-  - /usr/bin/time -f 'Spend time of %C -- %E (real)' bash .travis/install.sh
-  - export CXX=clang++ CC=clang;
-before_script:
-  - wget -O doxygen_exe https://cgal.geometryfactory.com/~mgimeno/doxygen_exe
-  - sudo mv doxygen_exe /usr/bin/doxygen
-  - sudo chmod +x /usr/bin/doxygen
-  - mkdir -p build
-  - cd build
-  - /usr/bin/time -f 'Spend time of %C -- %E (real)' cmake -DCMAKE_CXX_FLAGS="-std=c++1y" -DCGAL_HEADER_ONLY=ON -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG -DWITH_examples=ON -DWITH_demos=ON -DWITH_tests=ON ..
-  - /usr/bin/time -f 'Spend time of %C -- %E (real)' make
-  - /usr/bin/time -f 'Spend time of %C -- %E (real)' sudo make install &>/dev/null
-  - cd ..
-script:
-  - cd ./.travis
-  - /usr/bin/time -f 'Spend time of %C -- %E (real)' bash ./build_package.sh $PACKAGE
-notifications:
-  email:
-    on_success: change
-    # default: always
-    on_failure: always
-    # default: always