diff --git a/.travis.yml b/.travis.yml
index cbaf2f498..81068aabc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ env:
 #    special CXXFLAGS for maximum speed, overrides global CXXFLAGS, CHECK_CLANG is the var that controls if we download and check clang in that travis job
     - CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL"
     - SRCDIR=build CHECK_CLANG=yes VERIFY=1
+    - SRCDIR=build CHECK_LLVM=yes VERIFY=1
     - CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL" MAKEFLAGS="HAVE_RULES=yes" SRCDIR=build VERIFY=1
 
 matrix:
@@ -23,6 +24,8 @@ matrix:
   exclude:
     - compiler: clang
       env: SRCDIR=build CHECK_CLANG=yes VERIFY=1
+    - compiler: clang
+      env: SRCDIR=build CHECK_LLVM=yes VERIFY=1
 
 before_install:
 # install needed deps
@@ -31,9 +34,9 @@ before_install:
 
 script:
 # download clang git, compile cppcheck, run cppcheck on clang code to look for crashes in cppcheck. if this is done, terminate build
-  - if [[ "$CHECK_CLANG" == "yes" ]] && [[ "$CC" == "gcc" ]]; then wget "https://github.com/llvm-mirror/clang/archive/c2ca783d8b070d01b8d30b6c1d447563a6412af5.zip" & make -j 4 & wait; unzip c2ca783d8b070d01b8d30b6c1d447563a6412af5.zip > /dev/null; touch /tmp/clang.cppcheck; cd ./clang-c2ca783d8b070d01b8d30b6c1d447563a6412af5 ; ../cppcheck . --max-configs=1 --enable=all --inconclusive --exception-handling -iINPUTS -itest/Driver/Inputs/gen-response.c -j 2 |& tee /tmp/clang.cppcheck; cd ../; fi
+  - if [[ "$CHECK_CLANG" == "yes" ]] && [[ "$CC" == "gcc" ]]; then wget "https://github.com/llvm-mirror/clang/archive/bcaf7f2abe47b0dab055f1a0ec011ed9c2a3d3ea.zip" & make -j 4 & wait; unzip bcaf7f2abe47b0dab055f1a0ec011ed9c2a3d3ea.zip > /dev/null; touch /tmp/clang.cppcheck; cd ./clang-bcaf7f2abe47b0dab055f1a0ec011ed9c2a3d3ea ; ../cppcheck . --max-configs=1 --enable=all --inconclusive --exception-handling -iINPUTS -itest/Driver/Inputs/gen-response.c -itest/Index/index-many-logical-ops.c -itest/Sema/many-logical-ops.c -j 2 |& tee /tmp/clang.cppcheck; cd ../ ; echo "CLANG" ; ! grep "process crashed with signal\|Internal error\. compiled" /tmp/clang.cppcheck; exit; fi
 # check llvm as well
-  - if [[ "$CHECK_CLANG" == "yes" ]] && [[ "$CC" == "gcc" ]]; then wget "https://github.com/llvm-mirror/llvm/archive/1de675f473fb5c392d06e03cec4e8ee621e544ae.zip"; unzip 1de675f473fb5c392d06e03cec4e8ee621e544ae.zip > /dev/null; touch /tmp/llvm.cppcheck; cd ./llvm-1de675f473fb5c392d06e03cec4e8ee621e544ae ; ../cppcheck . --max-configs=1 --enable=all --inconclusive --exception-handling -j 2 |& tee /tmp/llvm.cppcheck; cd ../ ; echo "LLVM "  ; ! grep "process crashed with signal\|Internal error\. compiled" /tmp/llvm.cppcheck; echo "CLANG " ; ! grep "process crashed with signal\|Internal error\. compiled" /tmp/clang.cppcheck; exit; fi
+  - if [[  "$CHECK_LLVM" == "yes" ]] && [[ "$CC" == "gcc" ]]; then wget "https://github.com/llvm-mirror/llvm/archive/7733e74e5454d6f18da28c06be917c1e73d12d01.zip"  & make -j 4 & wait; unzip 7733e74e5454d6f18da28c06be917c1e73d12d01.zip > /dev/null;  touch /tmp/llvm.cppcheck;  cd ./llvm-7733e74e5454d6f18da28c06be917c1e73d12d01 ; ../cppcheck . --max-configs=1 --enable=all --inconclusive --exception-handling -j 2 |& tee /tmp/llvm.cppcheck; cd ../ ; echo "LLVM "  ; ! grep "process crashed with signal\|Internal error\. compiled" /tmp/llvm.cppcheck; exit; fi
 # check with TEST_MATHLIB_VALUE enabled
   - touch lib/mathlib.cpp test/testmathlib.cpp
   - make test -j4 CPPFLAGS=-DTEST_MATHLIB_VALUE