diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh
index de710037d..08d3cec59 100755
--- a/tools/commit-tests.sh
+++ b/tools/commit-tests.sh
@@ -59,50 +59,6 @@ COMMON_OPTIONS+=${EXTRA_OPTIONS}
 mkdir build || true
 cd build
 
-if [[ " 9X AVR9X ALL " =~ " ${FLAVOR} " ]] ; then
-  # OpenTX on 9X stock with FrSky telemetry
-  rm -rf *
-  cmake ${COMMON_OPTIONS} -DPCB=9X -DHELI=YES -DTEMPLATES=YES -DGVARS=YES -DTELEMETRY=FRSKY ${SRCDIR}
-  make -j${CORES} ${FIRMARE_TARGET}
-  make -j${CORES} libsimulator
-  make -j${CORES} gtests ; ./gtests ${TEST_OPTIONS}
-
-  # OpenTX on 9X stock with Ardupilot telemetry
-  rm -rf *
-  cmake ${COMMON_OPTIONS} -DPCB=9X -DHELI=YES -DTEMPLATES=YES -DGVARS=YES -DTELEMETRY=ARDUPILOT ${SRCDIR}
-  make -j${CORES} ${FIRMARE_TARGET}
-
-  # OpenTX on 9X stock with JETI telemetry
-  rm -rf *
-  cmake ${COMMON_OPTIONS} -DPCB=9X -DHELI=YES -DTEMPLATES=YES -DGVARS=YES -DTELEMETRY=JETI ${SRCDIR}
-  make -j${CORES} ${FIRMARE_TARGET}
-fi
-
-if [[ " MEGA2560 AVR9X ALL " =~ " ${FLAVOR} " ]] ; then
-  # OpenTX on Mega2560
-  rm -rf *
-  cmake ${COMMON_OPTIONS} -DPCB=MEGA2560 -DTEMPLATES=YES -DGVARS=YES -DHELI=YES ${SRCDIR}
-  make -j${CORES} ${FIRMARE_TARGET}
-  make -j${CORES} libsimulator
-  make -j${CORES} gtests ; ./gtests ${TEST_OPTIONS}
-
-  # OpenTX on Mega2560 with Mavlink telemetry
-  rm -rf *
-  cmake ${COMMON_OPTIONS} -DPCB=MEGA2560 -DTELEMETRY=MAVLINK -DHELI=YES -DTEMPLATES=YES -DAUDIO=YES -DVOICE=YES -DGVARS=YES ${SRCDIR}
-  make -j${CORES} ${FIRMARE_TARGET}
-  make -j${CORES} libsimulator
-  make -j${CORES} gtests ; ./gtests ${TEST_OPTIONS}
-fi
-
-if [[ " GRUVIN9X AVR9X ALL " =~ " ${FLAVOR} " ]] ; then
-  # OpenTX on gruvin9x board
-  rm -rf *
-  cmake ${COMMON_OPTIONS} -DPCB=GRUVIN9X -DHELI=YES -DTEMPLATES=YES -DAUDIO=YES -DVOICE=YES -DGVARS=YES ${SRCDIR}
-  make -j${CORES} ${FIRMARE_TARGET}
-  make -j${CORES} libsimulator
-  make -j${CORES} gtests ; ./gtests ${TEST_OPTIONS}
-fi
-
 if [[ " SKY9X ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
   # OpenTX on Sky9x
   rm -rf *