diff --git a/test/klippy/temperature.cfg b/test/klippy/temperature.cfg
new file mode 100644
index 00000000..a7742b23
--- /dev/null
+++ b/test/klippy/temperature.cfg
@@ -0,0 +1,137 @@
+# Test config with many different types of temperature sensors
+[stepper_x]
+step_pin: ar54
+dir_pin: ar55
+enable_pin: !ar38
+step_distance: .0125
+endstop_pin: ^ar3
+position_endstop: 0
+position_max: 200
+homing_speed: 50
+
+[stepper_y]
+step_pin: ar60
+dir_pin: !ar61
+enable_pin: !ar56
+step_distance: .0125
+endstop_pin: ^ar14
+position_endstop: 0
+position_max: 200
+homing_speed: 50
+
+[stepper_z]
+step_pin: ar46
+dir_pin: ar48
+enable_pin: !ar62
+step_distance: .0025
+endstop_pin: ^ar18
+position_endstop: 0.5
+position_max: 200
+
+[extruder]
+step_pin: ar26
+dir_pin: ar28
+enable_pin: !ar24
+step_distance: .002
+nozzle_diameter: 0.400
+filament_diameter: 1.750
+heater_pin: ar10
+sensor_type: AD595
+sensor_pin: analog13
+control: pid
+pid_Kp: 22.2
+pid_Ki: 1.08
+pid_Kd: 114
+min_temp: 0
+max_temp: 250
+
+[heater_bed]
+heater_pin: ar8
+sensor_type: PT100 INA826
+sensor_pin: analog14
+control: watermark
+min_temp: 0
+max_temp: 130
+
+[temperature_fan test_max6675]
+pin: ar1
+min_temp: 0
+max_temp: 100
+control: watermark
+sensor_type: MAX6675
+spi_mode: 0
+spi_speed: 100000
+sensor_pin: ar2
+
+[temperature_fan test_max31855]
+pin: ar4
+min_temp: 0
+max_temp: 100
+control: watermark
+sensor_type: MAX31855
+spi_mode: 0
+spi_speed: 100000
+sensor_pin: ar5
+
+[temperature_fan test_max31856]
+pin: ar6
+min_temp: 0
+max_temp: 100
+control: watermark
+sensor_type: MAX31856
+spi_mode: 0
+spi_speed: 100000
+sensor_pin: ar7
+
+[temperature_fan test_max31865]
+pin: ar12
+min_temp: 0
+max_temp: 100
+control: watermark
+sensor_type: MAX31865
+spi_mode: 0
+spi_speed: 100000
+sensor_pin: ar13
+
+[thermistor my_custom_thermistor]
+temperature1: 25
+resistance1: 100000
+temperature2: 100
+resistance2: 1500
+temperature3: 250
+resistance3: 100
+
+[temperature_fan test_custom_thermistor]
+pin: ar15
+min_temp: 0
+max_temp: 100
+control: watermark
+sensor_type: my_custom_thermistor
+sensor_pin: analog3
+
+[adc_temperature my_custom_adc]
+temperature1: 25
+voltage1: 1
+temperature2: 100
+voltage2: 2
+temperature3: 250
+voltage3: 3
+
+[temperature_fan test_custom_adc]
+pin: ar16
+min_temp: 0
+max_temp: 100
+control: watermark
+sensor_type: my_custom_adc
+sensor_pin: analog4
+
+[mcu]
+serial: /dev/ttyACM0
+pin_map: arduino
+
+[printer]
+kinematics: cartesian
+max_velocity: 300
+max_accel: 3000
+max_z_velocity: 5
+max_z_accel: 100
diff --git a/test/klippy/temperature.test b/test/klippy/temperature.test
new file mode 100644
index 00000000..efbeb3c3
--- /dev/null
+++ b/test/klippy/temperature.test
@@ -0,0 +1,17 @@
+# Tests for various temperature sensors
+DICTIONARY atmega2560-16mhz.dict
+CONFIG temperature.cfg
+
+# Set various temperatures
+M104 S100
+M105
+
+M140 S60
+M105
+
+M140 S0
+
+# Test "wait for temp" g-code
+M109 S100
+M109 S60
+M105