diff --git a/test/src/unit-cbor.cpp b/test/src/unit-cbor.cpp
index 31367b1c..4483c1b5 100644
--- a/test/src/unit-cbor.cpp
+++ b/test/src/unit-cbor.cpp
@@ -92,7 +92,7 @@ TEST_CASE("CBOR")
                         // create expected byte vector
                         std::vector<uint8_t> expected;
                         expected.push_back(static_cast<uint8_t>(0x39));
-                        uint16_t positive = -1 - i;
+                        uint16_t positive = static_cast<uint16_t>(-1 - i);
                         expected.push_back(static_cast<uint8_t>((positive >> 8) & 0xff));
                         expected.push_back(static_cast<uint8_t>(positive & 0xff));
 
diff --git a/test/src/unit-msgpack.cpp b/test/src/unit-msgpack.cpp
index b48be9c2..b242c93a 100644
--- a/test/src/unit-msgpack.cpp
+++ b/test/src/unit-msgpack.cpp
@@ -225,9 +225,9 @@ TEST_CASE("MessagePack")
 
                 SECTION("-32769..-2147483648")
                 {
-                    for (int32_t i : std::vector<int32_t>(
+                    for (auto i : std::vector<int32_t>(
                 {
-                    -32769l, -65536l, -77777l, -1048576l, -2147483648l
+                    -32769, -65536, -77777, -1048576, -2147483648
                 }))
                     {
                         CAPTURE(i);