diff --git a/buildroot/share/git/mftest b/buildroot/share/git/mftest
index aa3bc0317..bb08c1976 100755
--- a/buildroot/share/git/mftest
+++ b/buildroot/share/git/mftest
@@ -26,8 +26,11 @@ case $TESTENV in
     lpc9) TESTENV='LPC1769' ;;
     mega) TESTENV='megaatmega2560' ;;
      stm) TESTENV='STM32F1' ;;
+  teensy) TESTENV='teensy31' ;;
+     t31) TESTENV='teensy31' ;;
+     t32) TESTENV='teensy31' ;;
      t35) TESTENV='teensy35' ;;
-  teensy) TESTENV='teensy35' ;;
+     t36) TESTENV='teensy35' ;;
        -) ;;
 esac
 
diff --git a/buildroot/share/tests/teensy31-tests b/buildroot/share/tests/teensy31-tests
index 789214da7..a89002257 100755
--- a/buildroot/share/tests/teensy31-tests
+++ b/buildroot/share/tests/teensy31-tests
@@ -19,96 +19,14 @@ restore_configs
 opt_set MOTHERBOARD BOARD_TEENSY31_32
 opt_set TEMP_SENSOR_0 1
 opt_set TEMP_SENSOR_BED 1
-opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
-           FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \
+opt_enable EEPROM_SETTINGS FILAMENT_WIDTH_SENSOR CALIBRATION_GCODE BAUD_RATE_GCODE \
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
-           BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
-           PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT M100_FREE_MEMORY_WATCHER \
-           ADVANCED_PAUSE_FEATURE ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES PARK_HEAD_ON_PAUSE \
+           BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET PRINTCOUNTER SLOW_PWM_HEATERS PIDTEMPBED \
+           INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT M100_FREE_MEMORY_WATCHER \
+           NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PARK_HEAD_ON_PAUSE \
+           ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES \
            PHOTO_GCODE PHOTO_POSITION PHOTO_SWITCH_POSITION PHOTO_SWITCH_MS PHOTO_DELAY_MS PHOTO_RETRACT_MM \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT
 opt_set I2C_SLAVE_ADDRESS 63
 opt_set GRID_MAX_POINTS_X 16
 exec_test $1 $2 "Teensy3.1 with many features"
-
-#
-# Test a Sled Z Probe with Linear leveling
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY31_32
-opt_enable EEPROM_SETTINGS Z_PROBE_SLED AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE GCODE_MACROS
-exec_test $1 $2 "Sled Z Probe with Linear leveling"
-
-#
-# Test a Servo Probe
-#
-# restore_configs
-# opt_set MOTHERBOARD BOARD_TEENSY31_32
-# opt_enable Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE \
-#            AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS
-# opt_set NUM_SERVOS 1
-# exec_test $1 $2 "Servo Probe"
-#
-# ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES
-#
-# opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS \
-#            EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES
-# exec_test $1 $2 "...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES"
-
-#
-# Test MAGNETIC_PARKING_EXTRUDER with LCD
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY31_32
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_1 1
-opt_enable MAGNETIC_PARKING_EXTRUDER ULTIMAKERCONTROLLER
-exec_test $1 $2 "MAGNETIC_PARKING_EXTRUDER with LCD"
-
-#
-# Mixing Extruder
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY31_32
-opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-opt_set MIXING_STEPPERS 2
-exec_test $1 $2 "Mixing Extruder"
-
-#
-# Test SWITCHING_EXTRUDER
-#
-# restore_configs
-# opt_set MOTHERBOARD BOARD_TEENSY31_32
-# opt_set EXTRUDERS 2
-# opt_set NUM_SERVOS 1
-# opt_enable SWITCHING_EXTRUDER ULTIMAKERCONTROLLER
-# exec_test $1 $2 "SWITCHING_EXTRUDER"
-#
-# Enable COREXY
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY31_32
-opt_enable COREXY
-exec_test $1 $2 "COREXY"
-
-#
-# Enable COREXZ
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY31_32
-opt_enable COREXZ
-exec_test $1 $2 "COREXZ"
-
-#
-# Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY31_32
-opt_enable Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
-pins_set ramps/RAMPS X_MAX_PIN -1
-opt_add Z2_MAX_PIN 2
-opt_enable USE_XMAX_PLUG
-exec_test $1 $2 "Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS"
-
-# Clean up
-restore_configs