diff --git a/tests/domain/epc/test_water_heating_overlay.py b/tests/domain/epc/test_water_heating_overlay.py
index 6e0b1fdb..12e6e8be 100644
--- a/tests/domain/epc/test_water_heating_overlay.py
+++ b/tests/domain/epc/test_water_heating_overlay.py
@@ -49,6 +49,30 @@ def test_water_heating_systems_decode_to_their_codes(
     assert simulation.heating.water_heating_fuel == fuel
 
 
+@pytest.mark.parametrize(
+    ("water_heating_value", "code", "fuel"),
+    [
+        ("From main system, oil", 901, 28),
+        ("From main system, LPG (bulk)", 901, 27),
+        ("From main system, bottled LPG", 901, 3),
+        ("From main system, house coal", 901, 33),
+        # "boiler/circulator for water heating only" is SAP Table 4a code 911.
+        ("Gas boiler/circulator, mains gas", 911, 26),
+    ],
+)
+def test_more_water_heating_combos_decode_to_their_codes(
+    water_heating_value: str, code: int, fuel: int
+) -> None:
+    # Act
+    simulation = water_heating_overlay_for(water_heating_value, 0)
+
+    # Assert
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.water_heating_code == code
+    assert simulation.heating.water_heating_fuel == fuel
+
+
 @pytest.mark.parametrize("water_heating_value", ["Unknown", ""])
 def test_unresolvable_water_heating_produces_no_overlay(
     water_heating_value: str,