diff --git a/c++/cavl.hpp b/c++/cavl.hpp
index 9ca47b8..d76237e 100644
--- a/c++/cavl.hpp
+++ b/c++/cavl.hpp
@@ -34,11 +34,11 @@
 /// be costly in terms of execution time.
 #ifndef CAVL_ASSERT
 #    if defined(CAVL_NO_ASSERT) && CAVL_NO_ASSERT
-#                                       // NOLINTNEXTLINE(cppcoreguidelines-macro-usage) function-like macro
+// NOLINTNEXTLINE(cppcoreguidelines-macro-usage) function-like macro
 #        define CAVL_ASSERT(x) (void) 0 /* NOSONAR cpp:S960 */
 #    else
 #        include <cassert>
-#                                        // NOLINTNEXTLINE(cppcoreguidelines-macro-usage) function-like macro
+// NOLINTNEXTLINE(cppcoreguidelines-macro-usage) function-like macro
 #        define CAVL_ASSERT(x) assert(x) /* NOSONAR cpp:S960 */
 #    endif
 #endif
diff --git a/c++/test.cpp b/c++/test.cpp
index 6c260e2..13b5fa2 100644
--- a/c++/test.cpp
+++ b/c++/test.cpp
@@ -2,6 +2,8 @@
 
 #include "cavl.hpp"
 
+#include <unity.h>
+
 #include <algorithm>
 #include <array>
 #include <cstdint>
@@ -16,7 +18,6 @@
 #include <sstream>
 #include <string>
 #include <type_traits>
-#include <unity.h>
 #include <vector>
 
 #if __cplusplus >= 201703L