diff --git a/.travis.yml b/.travis.yml
index 7570c49b..a37fbdbb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,30 +2,6 @@ language: cpp
 
 matrix:
   include:
-    - os: osx
-      osx_image: xcode10
-      script:
-        - cmake --version
-        - mkdir ./build_avx2_17_release
-        - cd ./build_avx2_17_release
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON ..
-        - cmake -E time cmake --build .
-        - ctest
-      env:
-        - MATRIX_EVAL="INFO=C++17-avx2-release"
-
-    - os: osx
-      osx_image: xcode10
-      script:
-        - cmake --version
-        - mkdir ./build_avx2_17_debug
-        - cd ./build_avx2_17_debug
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON ..
-        - cmake -E time cmake --build .
-        - ctest
-      env:
-        - MATRIX_EVAL="INFO=C++17-avx2-debug"
-
     - os: osx
       osx_image: xcode10
       script:
@@ -51,28 +27,28 @@ matrix:
         - MATRIX_EVAL="INFO=C++17-pure-debug"
 
     - os: osx
-      osx_image: xcode8
+      osx_image: xcode10
       script:
         - cmake --version
-        - mkdir ./build_avx_14_release
-        - cd ./build_avx_14_release
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON ..
+        - mkdir ./build_avx2_17_release
+        - cd ./build_avx2_17_release
+        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON ..
         - cmake -E time cmake --build .
         - ctest
       env:
-        - MATRIX_EVAL="INFO=C++14-avx-release"
+        - MATRIX_EVAL="INFO=C++17-avx2-release"
 
     - os: osx
-      osx_image: xcode8
+      osx_image: xcode10
       script:
         - cmake --version
-        - mkdir ./build_avx_14_debug
-        - cd ./build_avx_14_debug
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON ..
+        - mkdir ./build_avx2_17_debug
+        - cd ./build_avx2_17_debug
+        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON ..
         - cmake -E time cmake --build .
         - ctest
       env:
-        - MATRIX_EVAL="INFO=C++14-avx-debug"
+        - MATRIX_EVAL="INFO=C++17-avx2-debug"
 
     - os: osx
       osx_image: xcode8
@@ -98,6 +74,30 @@ matrix:
       env:
         - MATRIX_EVAL="INFO=C++14-sse3-release"
 
+    - os: osx
+      osx_image: xcode8
+      script:
+        - cmake --version
+        - mkdir ./build_avx_14_release
+        - cd ./build_avx_14_release
+        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON ..
+        - cmake -E time cmake --build .
+        - ctest
+      env:
+        - MATRIX_EVAL="INFO=C++14-avx-release"
+
+    - os: osx
+      osx_image: xcode8
+      script:
+        - cmake --version
+        - mkdir ./build_avx_14_debug
+        - cd ./build_avx_14_debug
+        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON ..
+        - cmake -E time cmake --build .
+        - ctest
+      env:
+        - MATRIX_EVAL="INFO=C++14-avx-debug"
+
     - os: osx
       osx_image: xcode6.4
       script: