diff --git a/tests/applications/landlord_description_overrides/test_build_columns.py b/tests/applications/landlord_description_overrides/test_build_columns.py
index 8f50afce..0e47ed8d 100644
--- a/tests/applications/landlord_description_overrides/test_build_columns.py
+++ b/tests/applications/landlord_description_overrides/test_build_columns.py
@@ -51,3 +51,29 @@ def test_build_columns_wires_a_construction_age_band_classifier_column() -> None
     assert len(columns) == 1
     assert columns[0].name == "construction_age_band"
     assert columns[0].source_column == "Age"
+
+
+def test_build_columns_wires_a_water_heating_classifier_column() -> None:
+    # Arrange
+    chat_gpt = cast(ChatGPT, object())
+
+    # Act
+    columns = _build_columns({"water_heating": "Hot Water"}, chat_gpt, None)
+
+    # Assert
+    assert len(columns) == 1
+    assert columns[0].name == "water_heating"
+    assert columns[0].source_column == "Hot Water"
+
+
+def test_build_columns_wires_a_main_heating_system_classifier_column() -> None:
+    # Arrange
+    chat_gpt = cast(ChatGPT, object())
+
+    # Act
+    columns = _build_columns({"main_heating_system": "Heating"}, chat_gpt, None)
+
+    # Assert
+    assert len(columns) == 1
+    assert columns[0].name == "main_heating_system"
+    assert columns[0].source_column == "Heating"