diff --git a/radio/src/tests/crossfire.cpp b/radio/src/tests/crossfire.cpp
index 18350b7f2..0c5a52010 100644
--- a/radio/src/tests/crossfire.cpp
+++ b/radio/src/tests/crossfire.cpp
@@ -118,7 +118,7 @@ TEST(Crossfire, frameParser_incompleteFrames)
   EXPECT_EQ(ft.buffer[1], 0x0A);
 
   uint8_t* lua_buffer = luaInputTelemetryFifo->buffer();
-  EXPECT_EQ(luaInputTelemetryFifo->size(), 0x14 + 0x21 + 0x1F);
+  EXPECT_EQ(luaInputTelemetryFifo->size(), (size_t)(0x14 + 0x21 + 0x1F));
 
   unsigned offset = 0;
   EXPECT_EQ(lua_buffer[offset], 0x14);
@@ -169,14 +169,14 @@ TEST(Crossfire, frameParser_length)
   EXPECT_EQ(ft.len, 0);
 
   // the first complete frame should have been processed
-  EXPECT_EQ(luaInputTelemetryFifo->size(), 0x09);
+  EXPECT_EQ(luaInputTelemetryFifo->size(), (size_t)0x09);
 
   ft.process(length_error3);
   EXPECT_EQ(ft.len, 0);
 
   // only the first frame has been processed, as the rest
   // of the input buffer is thrown away due to length error
-  EXPECT_EQ(luaInputTelemetryFifo->size(), 0x09 + 0x09 + 0x09);
+  EXPECT_EQ(luaInputTelemetryFifo->size(), (size_t)(0x09 + 0x09 + 0x09));
 
   // check all 3 frames
   unsigned offset = 0;
@@ -216,7 +216,7 @@ TEST(Crossfire, frameParser_badFrames)
   EXPECT_EQ(ft.len,0);
 
   uint8_t* lua_buffer = luaInputTelemetryFifo->buffer();
-  EXPECT_EQ(luaInputTelemetryFifo->size(), 0x14 + 0x21 + 0x1F);
+  EXPECT_EQ(luaInputTelemetryFifo->size(), (size_t)(0x14 + 0x21 + 0x1F));
 
   unsigned offset = 0;
   EXPECT_EQ(lua_buffer[offset], 0x14);
@@ -264,7 +264,7 @@ TEST(Crossfire, frameParser_multipleJumboFrames)
   EXPECT_EQ(ft.len,0);
 
   uint8_t* lua_buffer = luaInputTelemetryFifo->buffer();
-  EXPECT_EQ(luaInputTelemetryFifo->size(), 62 + 61);
+  EXPECT_EQ(luaInputTelemetryFifo->size(), (size_t)(62 + 61));
 
   unsigned offset = 0;
   EXPECT_EQ(lua_buffer[offset], 0x3E);
diff --git a/radio/src/tests/lua.cpp b/radio/src/tests/lua.cpp
index 5e75045c9..7c7068aef 100644
--- a/radio/src/tests/lua.cpp
+++ b/radio/src/tests/lua.cpp
@@ -121,8 +121,8 @@ TEST(Lua, testModelInputs)
   EXPECT_EQ(3, (int)g_model.expoData[0].chn);
   EXPECT_STRNEQ("test1", g_model.expoData[0].name);
   EXPECT_EQ(MIXSRC_THR, g_model.expoData[0].srcRaw);
-  EXPECT_EQ(56, g_model.expoData[0].weight);
-  EXPECT_EQ(3, g_model.expoData[0].offset);
+  EXPECT_EQ(56u, g_model.expoData[0].weight);
+  EXPECT_EQ(3u, g_model.expoData[0].offset);
   EXPECT_EQ(2, g_model.expoData[0].swtch);
 
   // add another one before existing line on Input4
@@ -133,18 +133,18 @@ TEST(Lua, testModelInputs)
 #endif
   EXPECT_EQ(3, (int)g_model.expoData[0].chn);
   EXPECT_STRNEQ("test2", g_model.expoData[0].name);
-  EXPECT_EQ(MIXSRC_FIRST_STICK, g_model.expoData[0].srcRaw);
+  EXPECT_EQ((short int)MIXSRC_FIRST_STICK, g_model.expoData[0].srcRaw);
   SourceNumVal v;
   v.rawValue = g_model.expoData[0].weight;
   EXPECT_EQ(-56, v.value);
-  EXPECT_EQ(0, g_model.expoData[0].offset);
+  EXPECT_EQ(0u, g_model.expoData[0].offset);
   EXPECT_EQ(0, g_model.expoData[0].swtch);
 
   EXPECT_EQ(3, (int)g_model.expoData[1].chn);
   EXPECT_STRNEQ("test1", g_model.expoData[1].name);
   EXPECT_EQ(MIXSRC_THR, g_model.expoData[1].srcRaw);
-  EXPECT_EQ(56, g_model.expoData[1].weight);
-  EXPECT_EQ(3, g_model.expoData[1].offset);
+  EXPECT_EQ(56u, g_model.expoData[1].weight);
+  EXPECT_EQ(3u, g_model.expoData[1].offset);
   EXPECT_EQ(2, g_model.expoData[1].swtch);
 
 
@@ -159,14 +159,14 @@ TEST(Lua, testModelInputs)
   EXPECT_EQ(MIXSRC_FIRST_STICK, g_model.expoData[0].srcRaw);
   v.rawValue = g_model.expoData[0].weight;
   EXPECT_EQ(-56, v.value);
-  EXPECT_EQ(0, g_model.expoData[0].offset);
+  EXPECT_EQ(0u, g_model.expoData[0].offset);
   EXPECT_EQ(0, g_model.expoData[0].swtch);
 
   EXPECT_EQ(3, (int)g_model.expoData[1].chn);
   EXPECT_STRNEQ("test1", g_model.expoData[1].name);
   EXPECT_EQ(MIXSRC_THR, g_model.expoData[1].srcRaw);
-  EXPECT_EQ(56, g_model.expoData[1].weight);
-  EXPECT_EQ(3, g_model.expoData[1].offset);
+  EXPECT_EQ(56u, g_model.expoData[1].weight);
+  EXPECT_EQ(3u, g_model.expoData[1].offset);
   EXPECT_EQ(2, g_model.expoData[1].swtch);
 
   EXPECT_EQ(3, (int)g_model.expoData[2].chn);
@@ -176,8 +176,8 @@ TEST(Lua, testModelInputs)
 #else
   EXPECT_EQ(MIXSRC_LAST_STICK, g_model.expoData[2].srcRaw);
 #endif
-  EXPECT_EQ(100, g_model.expoData[2].weight);
-  EXPECT_EQ(0, g_model.expoData[2].offset);
+  EXPECT_EQ(100u, g_model.expoData[2].weight);
+  EXPECT_EQ(0u, g_model.expoData[2].offset);
   EXPECT_EQ(0, g_model.expoData[2].swtch);
 
   // verify number of lines for Input4