diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3289ff7aced0d2034dfda77676f343c1c25446c3..baebf0ef33e18a9566c148ee3502eaaa3adb8450 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,8 +20,13 @@ tests:
   stage: test
   script:
     - cmake .
-    - make tests -j4
-    - ./tests
+    - make test -j4
+    - ./test
+  after_script:
+    - ./test -r junit -o junit.xml
+  artifacts:
+    reports:
+      junit: junit.xml
 
 cppcheck:
   stage: build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecb94afa096616b538b52e72907b3c94d7ae0185..764116df0e81f9fe251684963583e03c71b37801 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,8 @@ add_custom_target(check
 # Specify the .cpp files for the executables
 add_executable(ecss_services src/main.cpp src/Message.cpp src/Service.cpp src/Services/TestService.cpp)
 
-IF(EXISTS lib/Catch2/CMakeLists.txt)
+IF(EXISTS "${PROJECT_SOURCE_DIR}/lib/Catch2/CMakeLists.txt")
 add_subdirectory(lib/Catch2)
-add_executable(tests src/Message.cpp src/Service.cpp src/Services/TestService.cpp tests/tests.cpp tests/Message.cpp)
-target_link_libraries(tests Catch2::Catch2)
+add_executable(test src/Message.cpp src/Service.cpp src/Services/TestService.cpp tests/tests.cpp tests/Message.cpp)
+target_link_libraries(test Catch2::Catch2)
 ENDIF()
diff --git a/ci/clang-tidy.sh b/ci/clang-tidy.sh
index 7d67a9fdb9e92a6a9be392e4f1d1614899ca93f9..1e676ce2d6926d700576c3a0fe69bad656c16389 100755
--- a/ci/clang-tidy.sh
+++ b/ci/clang-tidy.sh
@@ -11,4 +11,4 @@ echo -e "\033[0;34mRunning clang-tidy...\033[0m"
 
 cd "$(dirname "$0")"
 clang-tidy-4.0 `find ../src/ -type f -regextype posix-egrep -regex '.*\.(cpp|hpp|c|h)'` \
-    -- -std=c++14 -I../inc -fcolor-diagnostics
+    -extra-arg=-fcolor-diagnostics -- -std=c++14 -I../inc
diff --git a/tests/Message.cpp b/tests/Message.cpp
index f7698e3b93458474a159079174e75c4a89956f89..251945e127400d4ed3c1784f3433e078ea10268e 100644
--- a/tests/Message.cpp
+++ b/tests/Message.cpp
@@ -75,7 +75,7 @@ TEST_CASE("Requirement 7.3.2 (Boolean)", "[message][ecss]") {
 TEST_CASE("Requirement 7.3.3 (Enumerated)", "[message][ecss]") {
 	Message message(0, 0, Message::TC, 0);
 
-	message.appendEnum8(230);
+	message.appendEnum8(231);
 	message.appendEnum16(15933);
 	message.appendEnum32(2000001);
 	message.appendEnumerated(12, 2052);