diff --git a/include/tao/json/basic_value.hpp b/include/tao/json/basic_value.hpp
index 249831a1..875531cd 100644
--- a/include/tao/json/basic_value.hpp
+++ b/include/tao/json/basic_value.hpp
@@ -156,7 +156,7 @@ namespace tao::json
          return v;
       }
 
-      basic_value& operator=( basic_value v ) noexcept( std::is_nothrow_move_assignable_v< variant_t > && std::is_nothrow_move_assignable_v< public_base_t > )
+      basic_value& operator=( basic_value v ) noexcept( std::is_nothrow_move_assignable_v< variant_t >&& std::is_nothrow_move_assignable_v< public_base_t > )
       {
          m_variant = std::move( v.m_variant );
          public_base_t::operator=( static_cast< public_base_t&& >( v ) );
diff --git a/src/test/json/make_events.hpp b/src/test/json/make_events.hpp
index 6c733653..b2b9ecca 100644
--- a/src/test/json/make_events.hpp
+++ b/src/test/json/make_events.hpp
@@ -234,8 +234,10 @@ namespace tao::json::test
       }
       {
          // TODO: More numbers...
+         // clang-format off
       }
       {
+         // clang-format on
          c.string( "" );
          c.element();
       }