diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d9b3abb6..e60c35532 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,6 +225,11 @@ endif()
 
 add_subdirectory(${RADIO_SRC_DIRECTORY})
 
+add_custom_target(tests-radio
+  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gtests-radio
+  DEPENDS gtests-radio
+  )
+
 if(Qt5Core_FOUND AND NOT DISABLE_COMPANION)
   add_subdirectory(${COMPANION_SRC_DIRECTORY})
   add_custom_target(gtests DEPENDS gtests-radio gtests-companion)
diff --git a/companion/src/tests/conversions.cpp b/companion/src/tests/conversions.cpp
index bee7b9520..611c2a3f1 100644
--- a/companion/src/tests/conversions.cpp
+++ b/companion/src/tests/conversions.cpp
@@ -42,7 +42,7 @@ TEST(Conversions, ConversionX9DPFrom22)
   EXPECT_STREQ("Thr", model.inputNames[0]);
   EXPECT_STREQ("Tes", model.sensorData[0].label);
   EXPECT_EQ(10, model.sensorData[0].id);
-  EXPECT_EQ(9, model.sensorData[0].instance);
+  EXPECT_EQ(10, model.sensorData[0].instance);
   EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model.logicalSw[0].val1);
 }
 
@@ -77,7 +77,7 @@ TEST(Conversions, ConversionX9DPFrom23)
   EXPECT_STREQ("Rud", model1.inputNames[0]);
   EXPECT_STREQ("Tes", model1.sensorData[0].label);
   EXPECT_EQ(10, model1.sensorData[0].id);
-  EXPECT_EQ(10, model1.sensorData[0].instance);
+  EXPECT_EQ(11, model1.sensorData[0].instance);
   EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model1.logicalSw[0].val1);
 
   const ModelData & model2 = radioData.models[1];
@@ -96,7 +96,7 @@ TEST(Conversions, ConversionX9DPFrom23)
   EXPECT_STREQ("Rud", model2.inputNames[0]);
   EXPECT_STREQ("Tes", model2.sensorData[0].label);
   EXPECT_EQ(10, model2.sensorData[0].id);
-  EXPECT_EQ(10, model2.sensorData[0].instance);
+  EXPECT_EQ(11, model2.sensorData[0].instance);
   EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model2.logicalSw[0].val1);
 }
 
@@ -130,7 +130,7 @@ TEST(Conversions, ConversionX7From22)
 
   EXPECT_STREQ("Tes", model.sensorData[0].label);
   EXPECT_EQ(10, model.sensorData[0].id);
-  EXPECT_EQ(9, model.sensorData[0].instance);
+  EXPECT_EQ(10, model.sensorData[0].instance);
   EXPECT_EQ(900, model.limitData[0].max); // -100
 
   EXPECT_EQ(10, model.flightModeData[0].gvars[0]);
@@ -178,7 +178,7 @@ TEST(Conversions, ConversionXLiteFrom22)
 
   EXPECT_STREQ("Tes", model.sensorData[0].label);
   EXPECT_EQ(10, model.sensorData[0].id);
-  EXPECT_EQ(8, model.sensorData[0].instance);
+  EXPECT_EQ(9, model.sensorData[0].instance);
   EXPECT_EQ(900, model.limitData[0].max); // -100
 
   EXPECT_EQ(LS_FN_VPOS, model.logicalSw[0].func);
@@ -284,7 +284,7 @@ TEST(Conversions, ConversionX10From22)
   EXPECT_STREQ("Rud", model.inputNames[0]);
   EXPECT_STREQ("Tes", model.sensorData[0].label);
   EXPECT_EQ(10, model.sensorData[0].id);
-  EXPECT_EQ(9, model.sensorData[0].instance);
+  EXPECT_EQ(10, model.sensorData[0].instance);
   EXPECT_EQ(5 + 2 + 3, model.thrTraceSrc); // CH3
 }
 
@@ -360,6 +360,6 @@ TEST(Conversions, ConversionX12SFrom22)
   EXPECT_STREQ("Rud", model.inputNames[0]);
   EXPECT_STREQ("Tes", model.sensorData[0].label);
   EXPECT_EQ(10, model.sensorData[0].id);
-  EXPECT_EQ(9, model.sensorData[0].instance);
+  EXPECT_EQ(10, model.sensorData[0].instance);
   EXPECT_EQ(5 + 2 + 3, model.thrTraceSrc); // CH3
 }
diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh
index 73c7a2775..edb1dedaa 100755
--- a/tools/commit-tests.sh
+++ b/tools/commit-tests.sh
@@ -64,7 +64,7 @@ if [[ " SKY9X ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=SKY9X -DHELI=YES DLUA=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " AR9X ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
@@ -73,7 +73,7 @@ if [[ " AR9X ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=AR9X -DHELI=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " 9XRPRO ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
@@ -82,7 +82,7 @@ if [[ " 9XRPRO ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=9XRPRO -DHELI=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " X9LITE ALL " =~ " ${FLAVOR} " ]] ; then
@@ -91,7 +91,7 @@ if [[ " X9LITE ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=X9LITE -DHELI=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " X7 ALL " =~ " ${FLAVOR} " ]] ; then
@@ -100,7 +100,7 @@ if [[ " X7 ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=X7 -DHELI=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " XLITE ALL " =~ " ${FLAVOR} " ]] ; then
@@ -109,7 +109,7 @@ if [[ " XLITE ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=XLITE -DHELI=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " XLITES ALL " =~ " ${FLAVOR} " ]] ; then
@@ -118,7 +118,7 @@ if [[ " XLITES ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=XLITES -DHELI=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " X9D X9 ALL " =~ " ${FLAVOR} " ]] ; then
@@ -127,7 +127,7 @@ if [[ " X9D X9 ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " X9D+ X9 ALL " =~ " ${FLAVOR} " ]] ; then
@@ -136,7 +136,7 @@ if [[ " X9D+ X9 ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=X9D+ -DHELI=YES -DLUA=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " X9D+2019 X9 ALL " =~ " ${FLAVOR} " ]] ; then
@@ -145,7 +145,7 @@ if [[ " X9D+2019 X9 ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=X9D+ -DPCBREV=2019 -DHELI=YES -DLUA=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " X9E X9 ALL " =~ " ${FLAVOR} " ]] ; then
@@ -154,7 +154,7 @@ if [[ " X9E X9 ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=X9E -DHELI=YES -DLUA=YES -DGVARS=YES -DPPM_UNIT=PERCENT_PREC1 ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " X10 HORUS ALL " =~ " ${FLAVOR} " ]] ; then
@@ -163,7 +163,7 @@ if [[ " X10 HORUS ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=X10 -DHELI=YES -DLUA=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " X12S HORUS ALL " =~ " ${FLAVOR} " ]] ; then
@@ -172,7 +172,7 @@ if [[ " X12S HORUS ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=X12S -DHELI=YES -DLUA=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " T12 ALL " =~ " ${FLAVOR} " ]] ; then
@@ -181,7 +181,7 @@ if [[ " T12 ALL " =~ " ${FLAVOR} " ]] ; then
   cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T12 -DHELI=YES -DGVARS=YES ${SRCDIR}
   make -j${CORES} ${FIRMARE_TARGET}
   make -j${CORES} libsimulator
-  make -j${CORES} tests
+  make -j${CORES} tests-radio
 fi
 
 if [[ " DEFAULT ALL " =~ " ${FLAVOR} " ]] ; then
@@ -189,4 +189,5 @@ if [[ " DEFAULT ALL " =~ " ${FLAVOR} " ]] ; then
   rm -rf *
   cmake ${COMMON_OPTIONS} ${SRCDIR}
   make -j${CORES}
+  make -j${CORES} tests
 fi