diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index e0c1d8f38d..17605e3174 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -206,13 +206,26 @@ fi
 if [[ $TESTENV == '-' ]]; then
   IND=0
   NAMES=()
+  MENU=()
+  BIGLEN=0
   for FILE in $( ls -1 $TESTPATH/* )
   do
     let IND++
     TNAME=${FILE/$TESTPATH\//}
     NAMES+=($TNAME)
-    (( IND < 10 )) && echo -n " "
-    echo " $IND) $TNAME"
+    IFS=""
+    ITEM=$( printf "%2i) %s" $IND $TNAME )
+    MENU+=($ITEM)
+    [[ ${#ITEM} -gt $BIGLEN ]] && BIGLEN=${#ITEM}
+  done
+
+  (( BIGLEN += 2 ))
+  THIRD=$(( (${#MENU[@]} + 2) / 3 ))
+  for ((i = 0; i < $THIRD; i++))
+  do
+    COL1=$i ; COL2=$(( $i + $THIRD )) ; COL3=$(( $i + 2 * $THIRD ))
+    FMT="%-${BIGLEN}s"
+    printf "${FMT}${FMT}${FMT}\n" ${MENU[$COL1]} ${MENU[$COL2]} ${MENU[$COL3]}
   done
 
   echo