The purpose of this paper is to show the possible increase of self-consumption of photovoltaic (PV) electricity production for a building by intelligent use of thermal masses in the building. TRNSYS simulations were carried out for an electrically driven ground heat pump in combination with PV, thermally activated building systems and water storage (TES) in small single-family buildings. Several different control strategies adapting set-temperatures in combination with different building types and heat capacities were investigated. For a single-family house with 8900 kWh space heating and domestic hot water demand per year and a 20 m(2)PV system, the solar fraction (SF) increased from 11% for a standard configuration up to 61% with maximized use of overheating of the TES (2000 L tank) and the building mass. The running cost for the heat pump due to grid electricity consumption (0.18 EUR per kWh) decreased from 420 EUR per year - in the reference case without PV - to 373 EUR (SF = 11%) with PV, but in the standard configuration without PV self-consumption optimization, and to 69 EUR per year (SF = 61%) with PV self-consumption optimization, if the remaining PV electricity was completely sold at 0.05 EUR per kWh.