diff --git a/.travis.yml b/.travis.yml
index 0ac8efb80..7379fc504 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,20 @@ matrix:
       os: linux
       sudo: false
 
+    - env: Ubu=12.04cont Cmd="make uasan"
+      os: linux
+      sudo: false
+
+    - env: Ubu=14.04 Cmd='make test CC=clang-4.0 MOREFLAGS="-g -fsanitize=address -fsanitize=undefined"'
+      os: linux
+      dist: trusty
+      sudo: required
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-4.0
+          packages:
+            - clang-4.0
 
     - env: Ubu=14.04 Cmd='make -C tests test32 CC=clang-4.0 MOREFLAGS="-g -fsanitize=address"'
       os: linux
@@ -31,9 +45,13 @@ matrix:
             - clang-4.0
 
 
-    # Standard Ubuntu 12.04 LTS Server Edition 64 bit
-    - env: Ubu=12.04 Cmd='cd contrib/pzstd && make googletest && make tsan && make check && make clean && make asan && make check && make clean && cd ../..'
+    # Ubuntu 14.04 LTS Server Edition 64 bit
+    - env: Ubu=14.04 Cmd='cd contrib/pzstd && make googletest pzstd tests check && make clean
+                                           && make googletest32 all32 check && make clean
+                                           && make googletest tsan check && make clean
+                                           && make asan check && make clean'
       os: linux
+      dist: trusty
       sudo: required
       install:
         - export CXX="g++-6" CC="gcc-6"
@@ -43,30 +61,15 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-          packages:
-            - gcc-6
-            - g++-6
-
-
-    # Ubuntu 14.04 LTS Server Edition 64 bit
-    - env: Ubu=14.04 Cmd="make -C contrib/pzstd googletest pzstd tests check && make -C contrib/pzstd clean
-                       && make -C contrib/pzstd googletest32 && make -C contrib/pzstd all32 && make -C contrib/pzstd check && make -C contrib/pzstd clean"
-      os: linux
-      dist: trusty
-      sudo: required
-      install:
-        - export CXX="g++-4.8" CC="gcc-4.8"
-      addons:
-        apt:
           packages:
             - libc6-dev-i386
             - g++-multilib
-            - gcc-4.8
-            - gcc-4.8-multilib
-            - g++-4.8
-            - g++-4.8-multilib
+            - gcc-6
+            - gcc-6-multilib
+            - g++-6
+            - g++-6-multilib
 
-    - env: Ubu=14.04 Cmd="make armtest"
+    - env: Ubu=14.04 Cmd="make armtest && make clean && make aarch64test"
       dist: trusty
       sudo: required
       addons:
@@ -76,19 +79,10 @@ matrix:
             - qemu-user-static
             - gcc-arm-linux-gnueabi
             - libc6-dev-armel-cross
-
-    - env: Ubu=14.04 Cmd="make aarch64test"
-      dist: trusty
-      sudo: required
-      addons:
-        apt:
-          packages:
-            - qemu-system-arm
-            - qemu-user-static
             - gcc-aarch64-linux-gnu
             - libc6-dev-arm64-cross
 
-    - env: Ubu=14.04 Cmd='make ppctest'
+    - env: Ubu=14.04 Cmd='make ppctest && make clean && make ppc64test'
       dist: trusty
       sudo: required
       addons:
@@ -98,17 +92,6 @@ matrix:
             - qemu-user-static
             - gcc-powerpc-linux-gnu
 
-    - env: Ubu=14.04 Cmd='make ppc64test'
-      dist: trusty
-      sudo: required
-      addons:
-        apt:
-          packages:
-            - qemu-system-ppc
-            - qemu-user-static
-            - gcc-powerpc-linux-gnu
-
-
     # other feature branches => short tests
     - env: Ubu=14.04 Cmd='make lib && CFLAGS="-O1 -g" make -C zlibWrapper valgrindTest && make -C tests valgrindTest'
       os: linux
@@ -137,7 +120,7 @@ script:
   #  cron & master          => long tests, as this is the final step towards a Release
   #  dev                    => normal tests
   #  other feature branches => short tests (number > 10)
-  - if [ "$TRAVIS_EVENT_TYPE" = "cron" ] || [ "$TRAVIS_BRANCH" = "master" ]; then
+  - if [ "$TRAVIS_EVENT_TYPE" = "cron" ] || [ "$TRAVIS_BRANCH" = "asan" ]; then
         FUZZERTEST=-T10mn sh -c "$Cmd" || travis_terminate 1;
     else
         if [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ $JOB_NUMBER -gt 10 ] || [ "$TRAVIS_BRANCH" = "dev" ]; then