diff --git a/tests/can.test.cpp b/tests/can.test.cpp
index b05b337..f2f790b 100644
--- a/tests/can.test.cpp
+++ b/tests/can.test.cpp
@@ -48,15 +48,18 @@ void check_validity(hal::hertz p_operating_frequency,
     << "Frequency '" << p_operating_frequency << "' and baud rate '"
     << p_target_baud_rate << "'\n";
 
-  auto test_subject = call_result.value();
+  // clang-tidy for some reason doesn't accept that `.value()` as "checked"
+  // usage of an optional.
+  auto test_subject = call_result.value();  // NOLINT
 
   auto const bit_width = hal::bit_width(test_subject);
 
-  auto calculated_baud_rate =
-    p_operating_frequency /
-    (test_subject.clock_divider *
-     (test_subject.sync_segment + test_subject.propagation_delay +
-      test_subject.phase_segment1 + test_subject.phase_segment2));
+  auto const calculated_bit_width =
+    (test_subject.sync_segment + test_subject.propagation_delay +
+     test_subject.phase_segment1 + test_subject.phase_segment2);
+  auto const denominator =
+    static_cast<float>(test_subject.clock_divider * calculated_bit_width);
+  auto const calculated_baud_rate = p_operating_frequency / denominator;
 
   expect(that % 8 <= bit_width && bit_width <= 25)
     << "Bit width is beyond the bounds of 8 and 25";
diff --git a/tests/enum.test.cpp b/tests/enum.test.cpp
index 2b38d07..5c64280 100644
--- a/tests/enum.test.cpp
+++ b/tests/enum.test.cpp
@@ -24,7 +24,7 @@ boost::ut::suite<"enum_test"> enum_test = [] {
     constexpr int expected1 = 1;
     constexpr int expected2 = 20;
 
-    enum class test_enum
+    enum class test_enum : std::uint8_t
     {
       enum_value1 = expected1,
       enum_value2 = expected2,