diff --git a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
index 703652576..7eb57bc08 100644
--- a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
+++ b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
@@ -21,17 +21,17 @@
  */
 #pragma once
 
-/****************************************************************************************
-* Teensy 3.1 (MK20DX256) and Teensy 3.2 (MK20DX256) Breadboard pin assignments
-* Requires the Teensyduino software with Teensy 3.1 or Teensy 3.2 selected in Arduino IDE!
-* http://www.pjrc.com/teensy/teensyduino.html
-****************************************************************************************/
+/**
+ * Teensy 3.1 (MK20DX256) and Teensy 3.2 (MK20DX256) Breadboard pin assignments
+ * Requires the Teensyduino software with Teensy 3.1 or Teensy 3.2 selected in Arduino IDE!
+ * http://www.pjrc.com/teensy/teensyduino.html
+ */
 
 #if !IS_32BIT_TEENSY
   #error "Oops! Select 'Teensy 3.1' or 'Teensy 3.2' in 'Tools > Board.'"
 #endif
 
-#if IS_TEENSY32
+#ifndef BOARD_NAME
   #define BOARD_NAME "Teensy3.2"
 #endif
 
@@ -41,64 +41,73 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         3
-#define Y_STOP_PIN         4
-#define Z_STOP_PIN         5
+#define X_STOP_PIN          3
+#define Y_STOP_PIN          4
+#define Z_STOP_PIN          5
 
 //
 // Steppers
 //
-#define X_STEP_PIN         5
-#define X_DIR_PIN          6
-#define X_ENABLE_PIN       2
+#define X_STEP_PIN          5
+#define X_DIR_PIN           6
+#define X_ENABLE_PIN        2
 
-#define Y_STEP_PIN         7
-#define Y_DIR_PIN          8
-#define Y_ENABLE_PIN       2
+#define Y_STEP_PIN          7
+#define Y_DIR_PIN           8
+#define Y_ENABLE_PIN        2
 
-#define Z_STEP_PIN         9
+#define Z_STEP_PIN          9
 #define Z_DIR_PIN          10
-#define Z_ENABLE_PIN       2
+#define Z_ENABLE_PIN        2
 
 #define E0_STEP_PIN        11
 #define E0_DIR_PIN         12
-#define E0_ENABLE_PIN      2
+#define E0_ENABLE_PIN       2
 
-// #define E1_STEP_PIN        33
-// #define E1_DIR_PIN         34
-// #define E1_ENABLE_PIN      35
+//#define E1_STEP_PIN        33
+//#define E1_DIR_PIN         34
+//#define E1_ENABLE_PIN      35
 
+//
+// Heaters / Fans
+//
 #define HEATER_0_PIN       20
-// #define HEATER_1_PIN       36
+// #define HEATER_1_PIN      36
 #define HEATER_BED_PIN     21
 #ifndef FAN_PIN
   #define FAN_PIN          22
 #endif
 
-#define TEMP_0_PIN         14   // Extruder / Analog pin numbering: 2 => A2
-// #define TEMP_1_PIN          0
-#define TEMP_BED_PIN       15   // Bed / Analog pin numbering
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN         14   // Analog Input - Extruder 2 => A2
+//#define TEMP_1_PIN          0   // Analog Input
+#define TEMP_BED_PIN       15   // Analog Input - Bed
 
-// #define SDSS               16   // 8
+#ifndef FILWIDTH_PIN
+  #define FILWIDTH_PIN      6   // Analog Input
+#endif
+
+//
+// Misc. Functions
+//
+
+//#define SDSS               16   // 8
 #define LED_PIN            13
-#define PS_ON_PIN          -1
-#define ALARM_PIN          -1
 
-// #define FILWIDTH_PIN        6
-// #define SOL1_PIN           28
+//#define SOL1_PIN           28
+
+//
+// LCD / Controller
+//
+
+//#define SCK_PIN            13
+//#define MISO_PIN           12
+//#define MOSI_PIN           11
 
-#if 0
-// Pretty sure this is obsolete!
-// Please use Marlin 1.1.x pins files as reference for new pins files.
-#ifndef SDSUPPORT
-  // these are defined in the SD library if building with SD support
-  #define SCK_PIN          13
-  #define MISO_PIN         12
-  #define MOSI_PIN         11
-#endif
-#endif
 /*
-#ifdef ULTRA_LCD
+#if HAS_SPI_LCD
   #define LCD_PINS_RS      40
   #define LCD_PINS_ENABLE  41
   #define LCD_PINS_D4      42
diff --git a/buildroot/share/tests/teensy31-tests b/buildroot/share/tests/teensy31-tests
index 149308cb6..789214da7 100755
--- a/buildroot/share/tests/teensy31-tests
+++ b/buildroot/share/tests/teensy31-tests
@@ -17,9 +17,7 @@ exec_test $1 $2 "Teensy3.1 with default config"
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_TEENSY31_32
-opt_set EXTRUDERS 2
 opt_set TEMP_SENSOR_0 1
-opt_set TEMP_SENSOR_1 5
 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 \