diff --git a/radio/src/tests/conversions.cpp b/radio/src/tests/conversions.cpp
index 6ae0bc092..616d661a5 100644
--- a/radio/src/tests/conversions.cpp
+++ b/radio/src/tests/conversions.cpp
@@ -258,8 +258,10 @@ TEST(Conversions, ConversionX7From23)
     (0x03 << (3 * 2)) | // SC down
     (0x03 << (3 * 4));  // SF down
 
+  swarnstate_t sw_mask = (1 << (NUM_SWITCHES * 3)) - 1;
+  
   // check only the "allowed switches"
-  EXPECT_EQ(state, g_model.switchWarningState & 0x7FFF);
+  EXPECT_EQ(state & sw_mask, g_model.switchWarningState & 0x7FFF);
   
   EXPECT_STRNEQ("Test", g_model.header.name);
   EXPECT_EQ(MODULE_TYPE_R9M_PXX1, g_model.moduleData[EXTERNAL_MODULE].type);