diff --git a/.travis.yml b/.travis.yml
index bf56673..cf29f94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,7 @@ before_install:
   - ./ci/update_ci.sh #travis_wait 90 ./ci/update_ci.sh
 
 script:
-  - script=compile CXX=clang++ CC=clang ./ci/execute.sh
+  - script=static_analysis ./ci/execute.sh
   - script=clean ./ci/execute.sh
   - script=compile CXX=g++ CC=gcc ./ci/execute.sh
-  - script=static_analysis ./ci/execute.sh
   - script=compile make_command="broadwayd & CTEST_OUTPUT_ON_FAILURE=1 make test" ./ci/execute.sh
diff --git a/ci/static_analysis.sh b/ci/static_analysis.sh
index f24a142..bdd34f7 100755
--- a/ci/static_analysis.sh
+++ b/ci/static_analysis.sh
@@ -1,8 +1,15 @@
 #!/bin/bash
 
+if [ "${cmake_command}" == "" ]; then
+  cmake_command="scan-build cmake .."
+fi
+
 if [ "${make_command}" == "" ]; then
-  make_command="make -j 2"
+  make_command="scan-build --status-bugs make -j 2"
 fi
 
-cd jucipp/build || exit
-exec sh -c "scan-build -o ../html_${distribution} --status-bugs ${make_command}"
+cd jucipp || echo "Can't cd into jucipp"
+git submodule update --init --recursive # appveyor doesn't checkout recursively
+mkdir -p build && cd build || echo "Error making build directory"
+sh -c "${cmake_command}" || echo "Cmake configuration failed"
+exec sh -c "${make_command}"