diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eefa079..28a2d94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,6 +102,7 @@ Test:arm-linux-gnueabihf:
   dependencies:
     - Restore:arm-linux-gnueabihf
     - Build:arm-linux-gnueabihf
+  when: manual
 
 Test:x86_64-alpine-linux-musl:
   <<: *test
diff --git a/meson.build b/meson.build
index 16d813f..a31f5ba 100644
--- a/meson.build
+++ b/meson.build
@@ -29,8 +29,8 @@ endif
 
 dep = declare_dependency(link_with : chosen_lib, include_directories : includes)
 
-cppcheck = custom_target('cppcheck_internal',
-  output : 'cppcheck.log',
+cppcheck = custom_target(meson.project_name() + '_cppcheck_internal',
+  output : meson.project_name() + '_cppcheck.log',
   input : sources + test_files,
   command : [
     'cppcheck',
@@ -39,7 +39,7 @@ cppcheck = custom_target('cppcheck_internal',
     '-I', meson.current_source_dir() / 'src',
     '@INPUT@',
 #   '--project=compile_commands.json',
-    '--output-file=cppcheck.log'
+    '--output-file=@OUTPUT@'
 ])
 
-run_target('cppcheck', command : ['cat', meson.current_build_dir() / 'cppcheck.log'], depends : cppcheck)
+run_target('cppcheck', command : ['cat', cppcheck.full_path()], depends : cppcheck)
diff --git a/test/test.hpp b/test/test.hpp
index 1ec251d..8cc9ce3 100644
--- a/test/test.hpp
+++ b/test/test.hpp
@@ -20,9 +20,9 @@ namespace std {
 
 namespace tests {
 
-class assertion_error : std::runtime_error {
+class assertion_error : public std::runtime_error {
 public:
-    explicit assertion_error(const std::string & message) : ::std::runtime_error(message) {}
+    explicit assertion_error(const std::string & message) : std::runtime_error(message) {}
 };
 
 struct {