diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
index 0c3c39065..db85f8d7c 100644
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
@@ -47,9 +47,9 @@ SOFTWARE.
     #endif
 #endif
 
-#define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 10
-#define NLOHMANN_JSON_VERSION_PATCH 5
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 10  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 5   // NOLINT(modernize-macro-to-enum)
 
 #include <algorithm> // all_of, find, for_each
 #include <cstddef> // nullptr_t, ptrdiff_t, size_t
@@ -827,7 +827,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
 
     /// @brief create a null object
     /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(std::nullptr_t = nullptr) noexcept
+    basic_json(std::nullptr_t = nullptr) noexcept // NOLINT(bugprone-exception-escape)
         : basic_json(value_t::null)
     {
         assert_invariant();
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index ed2a9cf2c..8e2863501 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -47,9 +47,9 @@ SOFTWARE.
     #endif
 #endif
 
-#define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 10
-#define NLOHMANN_JSON_VERSION_PATCH 5
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 10  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 5   // NOLINT(modernize-macro-to-enum)
 
 #include <algorithm> // all_of, find, for_each
 #include <cstddef> // nullptr_t, ptrdiff_t, size_t
@@ -18021,7 +18021,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
 
     /// @brief create a null object
     /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(std::nullptr_t = nullptr) noexcept
+    basic_json(std::nullptr_t = nullptr) noexcept // NOLINT(bugprone-exception-escape)
         : basic_json(value_t::null)
     {
         assert_invariant();
diff --git a/test/src/unit-allocator.cpp b/test/src/unit-allocator.cpp
index 268ae54df..b2d27c8be 100644
--- a/test/src/unit-allocator.cpp
+++ b/test/src/unit-allocator.cpp
@@ -49,7 +49,7 @@ struct bad_allocator : std::allocator<T>
 };
 } // namespace
 
-TEST_CASE("bad_alloc")
+TEST_CASE("bad_alloc") // NOLINT(cert-err58-cpp)
 {
     SECTION("bad_alloc")
     {
@@ -132,7 +132,7 @@ void my_allocator_clean_up(T* p)
 }
 } // namespace
 
-TEST_CASE("controlled bad_alloc")
+TEST_CASE("controlled bad_alloc") // NOLINT(cert-err58-cpp)
 {
     // create JSON type using the throwing allocator
     using my_json = nlohmann::basic_json<std::map,
@@ -255,7 +255,7 @@ struct allocator_no_forward : std::allocator<T>
 };
 } // namespace
 
-TEST_CASE("bad my_allocator::construct")
+TEST_CASE("bad my_allocator::construct") // NOLINT(cert-err58-cpp)
 {
     SECTION("my_allocator::construct doesn't forward")
     {