diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 04ac7fcee..a179a3603 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,6 +4,7 @@ enable_testing()
 
 add_test(NAME dummy_test COMMAND dummy_test)
 add_test(NAME expression_test COMMAND expression_test)
+add_test(NAME clamped_arithmetic_test COMMAND clamped_arithmetic_test)
 add_test(NAME test_age_formatting COMMAND test_age_formatting)
 add_test(NAME password_hash_test COMMAND password_hash_test)
 add_test(NAME server_card_counter_test COMMAND server_card_counter_test)
@@ -16,6 +17,7 @@ set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 5)
 
 add_executable(dummy_test dummy_test.cpp)
 add_executable(expression_test expression_test.cpp)
+add_executable(clamped_arithmetic_test clamped_arithmetic_test.cpp)
 add_executable(test_age_formatting test_age_formatting.cpp)
 add_executable(password_hash_test password_hash_test.cpp)
 add_executable(deck_hash_performance_test deck_hash_performance_test.cpp)
@@ -49,6 +51,7 @@ if(NOT GTEST_FOUND)
   set(GTEST_BOTH_LIBRARIES gtest)
   add_dependencies(dummy_test gtest)
   add_dependencies(expression_test gtest)
+  add_dependencies(clamped_arithmetic_test gtest)
   add_dependencies(test_age_formatting gtest)
   add_dependencies(password_hash_test gtest)
   add_dependencies(deck_hash_performance_test gtest)
@@ -59,6 +62,9 @@ endif()
 include_directories(${GTEST_INCLUDE_DIRS})
 target_link_libraries(dummy_test Threads::Threads ${GTEST_BOTH_LIBRARIES})
 target_link_libraries(expression_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(
+  clamped_arithmetic_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+)
 target_link_libraries(
   test_age_formatting libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
 )
diff --git a/tests/clamped_arithmetic_test.cpp b/tests/clamped_arithmetic_test.cpp
new file mode 100644
index 000000000..2471d5870
--- /dev/null
+++ b/tests/clamped_arithmetic_test.cpp
@@ -0,0 +1,44 @@
+/** @file clamped_arithmetic_test.cpp
+ *  @brief Tests for shared helpers in clamped_arithmetic.h.
+ *  @ingroup Tests
+ */
+
+#include <gtest/gtest.h>
+#include <libcockatrice/utility/clamped_arithmetic.h>
+#include <limits>
+
+TEST(AddClamped, AddsWithinBounds)
+{
+    EXPECT_EQ(addClamped(5, 3, 0, 100), 8);
+    EXPECT_EQ(addClamped(10, -3, 0, 100), 7);
+}
+
+TEST(AddClamped, ClampsToUpperAndLowerBound)
+{
+    EXPECT_EQ(addClamped(99, 5, 0, 100), 100);  // saturates at max
+    EXPECT_EQ(addClamped(2, -10, 0, 100), 0);   // saturates at min
+    EXPECT_EQ(addClamped(999, 1, 0, 999), 999); // crossing the counter cap holds at the bound
+}
+
+TEST(AddClamped, IntOverflowDoesNotWrap)
+{
+    // The 64-bit intermediate must prevent signed-int overflow UB.
+    constexpr int intMax = std::numeric_limits<int>::max();
+    constexpr int intMin = std::numeric_limits<int>::min();
+    EXPECT_EQ(addClamped(intMax, 1, intMin, intMax), intMax);
+    EXPECT_EQ(addClamped(intMax, intMax, intMin, intMax), intMax);
+}
+
+TEST(AddClamped, IntUnderflowDoesNotWrap)
+{
+    constexpr int intMax = std::numeric_limits<int>::max();
+    constexpr int intMin = std::numeric_limits<int>::min();
+    EXPECT_EQ(addClamped(intMin, -1, intMin, intMax), intMin);
+    EXPECT_EQ(addClamped(intMin, intMin, intMin, intMax), intMin);
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}