diff --git a/ci/cppcheck.sh b/ci/cppcheck.sh
index a8335c61296643714ec50b402b322253be41c254..6da4d33694f44e13b0d05a789f359ce84a2e70f5 100755
--- a/ci/cppcheck.sh
+++ b/ci/cppcheck.sh
@@ -10,4 +10,4 @@
 echo -e "\033[0;34mRunning cppcheck...\033[0m"
 
 cd "$(dirname "$0")/.."
-cppcheck --enable=all --error-exitcode=1 -I inc src
+cppcheck --enable=all --error-exitcode=1 -I inc src tests
diff --git a/ci/vera.sh b/ci/vera.sh
index 9f7d0b6a391c7554bc73fe6b1baab1278e49e868..b758842ff8b395ee548e6389a8f6b08426fbaf87 100755
--- a/ci/vera.sh
+++ b/ci/vera.sh
@@ -10,4 +10,4 @@
 echo -e "\033[0;34mRunning vera++...\033[0m"
 
 cd "$(dirname "$0")/.."
-vera++ --error --profile custom `find src inc -type f -regextype posix-egrep -regex '.*\.(cpp|hpp|c|h)'`
+vera++ --error --profile custom `find src inc tests -type f -regextype posix-egrep -regex '.*\.(cpp|hpp|c|h)'`
diff --git a/tests/Message.cpp b/tests/Message.cpp
index f7698e3b93458474a159079174e75c4a89956f89..dafd2c8d60b84816cfe2490ba2cede86418de005 100644
--- a/tests/Message.cpp
+++ b/tests/Message.cpp
@@ -68,7 +68,7 @@ TEST_CASE("Requirement 7.3.2 (Boolean)", "[message][ecss]") {
 
 	REQUIRE(message.dataSize == 2);
 
-	CHECK(!message.readBoolean());
+	CHECK_FALSE(message.readBoolean());
 	CHECK(message.readBoolean());
 }
 
diff --git a/tests/Services/TestService.cpp b/tests/Services/TestService.cpp
index 0a5233a6dd716b262ce7901f234bc569789852a3..a94934ad20836620ec2ab1779d4ce0107798d08c 100644
--- a/tests/Services/TestService.cpp
+++ b/tests/Services/TestService.cpp
@@ -30,4 +30,3 @@ TEST_CASE("TM[17,3]", "[service][st17]") {
 	REQUIRE(response.dataSize == 2);
 	CHECK(response.readEnum16() == 40);
 }
-