diff --git a/.gitignore b/.gitignore
index ef8d050eb..5b2bc0fab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,8 @@ fuzz-testing
 *.gcno
 *.gcda
 
-ndk
 build
-working
+build_coverage
 
 doc/xml
 doc/html
@@ -20,17 +19,4 @@ benchmarks/files/numbers/*.json
 .idea
 cmake-build-debug
 
-
 test/test-*
-.svn
-
-test/thirdparty/Fuzzer/libFuzzer.a
-
-test/parse_afl_fuzzer
-
-test/parse_cbor_fuzzer
-
-test/parse_msgpack_fuzzer
-
-minibench
-
diff --git a/.travis.yml b/.travis.yml
index f0df62b5a..89f3a42b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -105,8 +105,8 @@ matrix:
           name: "nlohmann/json"
           description: "Build submitted via Travis CI"
         notification_email: niels.lohmann@gmail.com
-        build_command_prepend: "make clean"
-        build_command: "make"
+        build_command_prepend: "mkdir coverity_build ; cd coverity_build ; cmake .. ; cd .."
+        build_command: "make -C coverity_build"
         branch_pattern: coverity_scan
     env:
       - SPECIAL=coverity
@@ -252,7 +252,7 @@ matrix:
 ################
 
 script:
-  # get CMake (only for systems with brew - macOS)
+  # get CMake and Ninja (only for systems with brew - macOS)
   - |
      if [[ (-x $(which brew)) ]]; then
        brew update
diff --git a/test/src/prefix.hpp b/test/src/prefix.hpp
deleted file mode 100644
index 9df98c79b..000000000
--- a/test/src/prefix.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "catch.hpp"
-
-#define private public
-#include "json.hpp"
-using nlohmann::json;