diff --git a/tools/build-gh.sh b/tools/build-gh.sh
index 1e3dad9325..8164281c9f 100755
--- a/tools/build-gh.sh
+++ b/tools/build-gh.sh
@@ -118,6 +118,9 @@ case $FLAVOR in
     T16)
         BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=T16"
         ;;
+    T18)
+        BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=T18"
+        ;;
     TX16S)
         BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=TX16S"
         ;;
diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh
index bd229295de..e1bda7b6b6 100755
--- a/tools/commit-tests.sh
+++ b/tools/commit-tests.sh
@@ -229,6 +229,15 @@ if [[ " T16 COLORLCD ALL " =~ \ ${FLAVOR}\  ]] ; then
   make -j"${CORES}" tests-radio
 fi
 
+if [[ " T18 COLORLCD ALL " =~ \ ${FLAVOR}\  ]] ; then
+  # OpenTX on T16 boards
+   rm -rf ./* || true
+  cmake "${COMMON_OPTIONS}" -DPCB=X10 -DPCBREV=T18 -DHELI=YES -DLUA=YES -DGVARS=YES -DAFHDS3=NO "${SRCDIR}"
+  make -j"${CORES}" ${FIRMARE_TARGET}
+  make -j"${CORES}" libsimulator
+  make -j"${CORES}" tests-radio
+fi
+
 if [[ " TX16S COLORLCD ALL " =~ \ ${FLAVOR}\  ]] ; then
   # OpenTX on TX16S boards
    rm -rf ./* || true