diff --git a/assets/js/components/Loadpoint.vue b/assets/js/components/Loadpoint.vue
index 31fbdc608c..90042216cc 100644
--- a/assets/js/components/Loadpoint.vue
+++ b/assets/js/components/Loadpoint.vue
@@ -28,6 +28,7 @@
 			@maxcurrent-updated="setMaxCurrent"
 			@mincurrent-updated="setMinCurrent"
 			@phasesconfigured-updated="setPhasesConfigured"
+			@batteryboost-updated="setBatteryBoost"
 		/>
 
 		<div
@@ -132,6 +133,8 @@ export default {
 		remoteDisabledSource: String,
 		chargeDuration: Number,
 		charging: Boolean,
+		batteryBoost: Boolean,
+		batteryConfigured: Boolean,
 
 		// session
 		sessionEnergy: Number,
@@ -273,6 +276,12 @@ export default {
 		hasSmartCost: function () {
 			return smartCostAvailable(this.smartCostType);
 		},
+		batteryBoostAvailable: function () {
+			return this.batteryConfigured && this.$hiddenFeatures();
+		},
+		batteryBoostActive: function () {
+			return this.batteryBoost && this.charging && !["off", "now"].includes(this.mode);
+		},
 	},
 	watch: {
 		phaseRemaining() {
@@ -336,6 +345,9 @@ export default {
 		removeVehicle() {
 			api.delete(this.apiPath("vehicle"));
 		},
+		setBatteryBoost: function (batteryBoost) {
+			api.post(this.apiPath("batteryboost") + `/${batteryBoost ? "1" : "0"}`);
+		},
 		fmtPower(value) {
 			return this.fmtW(value, POWER_UNIT.AUTO);
 		},
diff --git a/assets/js/components/LoadpointSettingsBatteryBoost.vue b/assets/js/components/LoadpointSettingsBatteryBoost.vue
new file mode 100644
index 0000000000..c8bddcc9bb
--- /dev/null
+++ b/assets/js/components/LoadpointSettingsBatteryBoost.vue
@@ -0,0 +1,72 @@
+<template>
+	<div>
+		<h6>
+			{{ $t("main.loadpointSettings.batteryUsage") }}
+		</h6>
+
+		<div class="mb-3 row" data-testid="battery-boost">
+			<label :for="formId('batteryBoost')" class="col-sm-4 col-form-label pt-0 pt-sm-2">
+				{{ $t("main.loadpointSettings.batteryBoost.label") }}&nbsp;🧪
+			</label>
+			<div class="col-sm-8 pe-0">
+				<div class="form-check form-switch my-1">
+					<input
+						:id="formId('batteryBoost')"
+						v-model="selectedEnabled"
+						class="form-check-input"
+						type="checkbox"
+						role="switch"
+						:disabled="disabled"
+						data-testid="battery-boost-checkbox"
+						@change="handleEnabledChange"
+					/>
+					<label :for="formId('batteryBoost')" class="form-check-label">
+						<div>
+							{{ $t("main.loadpointSettings.batteryBoost.description") }}
+						</div>
+						<span v-if="selectedEnabled && !disabled" class="d-block text-primary">
+							{{ $t("main.loadpointSettings.batteryBoost.once") }}
+						</span>
+						<small v-if="disabled" class="d-block">
+							{{ $t("main.loadpointSettings.batteryBoost.mode") }}
+						</small>
+					</label>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import formatter from "../mixins/formatter";
+
+export default {
+	mixins: [formatter],
+	props: {
+		formId: Function,
+		mode: String,
+		batteryBoost: Boolean,
+	},
+	data() {
+		return {
+			selectedEnabled: this.batteryBoost,
+		};
+	},
+	watch: {
+		batteryBoost(newVal) {
+			this.selectedEnabled = newVal;
+		},
+	},
+	computed: {
+		disabled() {
+			return ["off", "now"].includes(this.mode);
+		},
+	},
+	methods: {
+		handleEnabledChange() {
+			this.$emit("batteryboost-updated", this.selectedEnabled);
+		},
+	},
+	emits: ["batteryboost-updated"],
+};
+</script>
diff --git a/assets/js/components/LoadpointSettingsModal.vue b/assets/js/components/LoadpointSettingsModal.vue
index 4bde012ef9..49c17eb9fa 100644
--- a/assets/js/components/LoadpointSettingsModal.vue
+++ b/assets/js/components/LoadpointSettingsModal.vue
@@ -30,6 +30,12 @@
 								v-bind="smartCostLimitProps"
 								class="mt-2"
 							/>
+							<LoadpointSettingsBatteryBoost
+								v-if="batteryBoostAvailable"
+								v-bind="batteryBoostProps"
+								class="mt-2"
+								@batteryboost-updated="changeBatteryBoost"
+							/>
 							<h6>
 								{{ $t("main.loadpointSettings.currents") }}
 							</h6>
@@ -153,6 +159,7 @@ import collector from "../mixins/collector";
 import formatter from "../mixins/formatter";
 import SmartCostLimit from "./SmartCostLimit.vue";
 import smartCostAvailable from "../utils/smartCostAvailable";
+import LoadpointSettingsBatteryBoost from "./LoadpointSettingsBatteryBoost.vue";
 
 const V = 230;
 
@@ -172,13 +179,16 @@ const insertSorted = (arr, num) => {
 export default {
 	name: "LoadpointSettingsModal",
 	mixins: [formatter, collector],
-	components: { SmartCostLimit },
+	components: { SmartCostLimit, LoadpointSettingsBatteryBoost },
 	props: {
 		id: [String, Number],
 		phasesConfigured: Number,
 		phasesActive: Number,
 		chargerPhases1p3p: Boolean,
 		chargerPhysicalPhases: Number,
+		batteryBoost: Boolean,
+		batteryBoostAvailable: Boolean,
+		mode: String,
 		minSoc: Number,
 		maxCurrent: Number,
 		minCurrent: Number,
@@ -189,8 +199,13 @@ export default {
 		currency: String,
 		multipleLoadpoints: Boolean,
 	},
-	emits: ["phasesconfigured-updated", "maxcurrent-updated", "mincurrent-updated"],
-	data: function () {
+	emits: [
+		"phasesconfigured-updated",
+		"maxcurrent-updated",
+		"mincurrent-updated",
+		"batteryboost-updated",
+	],
+	data() {
 		return {
 			selectedMaxCurrent: this.maxCurrent,
 			selectedMinCurrent: this.minCurrent,
@@ -199,7 +214,7 @@ export default {
 		};
 	},
 	computed: {
-		phasesOptions: function () {
+		phasesOptions() {
 			if (this.chargerPhysicalPhases == 1) {
 				// known fixed phase configuration, no settings required
 				return [];
@@ -211,7 +226,10 @@ export default {
 			// 1p or 3p possible
 			return [PHASES_3, PHASES_1];
 		},
-		maxPower: function () {
+		batteryBoostProps() {
+			return this.collectProps(LoadpointSettingsBatteryBoost);
+		},
+		maxPower() {
 			if (this.chargerPhases1p3p) {
 				if (this.phasesConfigured === PHASES_AUTO) {
 					return this.maxPowerPhases(3);
@@ -222,7 +240,7 @@ export default {
 			}
 			return this.fmtW(this.maxCurrent * V * this.phasesActive);
 		},
-		minPower: function () {
+		minPower() {
 			if (this.chargerPhases1p3p) {
 				if (this.phasesConfigured === PHASES_AUTO) {
 					return this.minPowerPhases(1);
@@ -233,22 +251,22 @@ export default {
 			}
 			return this.fmtW(this.minCurrent * V * this.phasesActive);
 		},
-		minCurrentOptions: function () {
+		minCurrentOptions() {
 			const opt1 = [...range(Math.floor(this.maxCurrent), 1), 0.5, 0.25, 0.125];
 			// ensure that current value is always included
 			const opt2 = insertSorted(opt1, this.minCurrent);
 			return opt2.map((value) => this.currentOption(value, value === 6));
 		},
-		maxCurrentOptions: function () {
+		maxCurrentOptions() {
 			const opt1 = range(32, Math.ceil(this.minCurrent));
 			// ensure that current value is always included
 			const opt2 = insertSorted(opt1, this.maxCurrent);
 			return opt2.map((value) => this.currentOption(value, value === 16));
 		},
-		smartCostLimitProps: function () {
+		smartCostLimitProps() {
 			return this.collectProps(SmartCostLimit);
 		},
-		loadpointId: function () {
+		loadpointId() {
 			return this.id;
 		},
 		smartCostAvailable() {
@@ -256,16 +274,16 @@ export default {
 		},
 	},
 	watch: {
-		maxCurrent: function (value) {
+		maxCurrent(value) {
 			this.selectedMaxCurrent = value;
 		},
-		minCurrent: function (value) {
+		minCurrent(value) {
 			this.selectedMinCurrent = value;
 		},
-		phasesConfigured: function (value) {
+		phasesConfigured(value) {
 			this.selectedPhases = value;
 		},
-		minSoc: function (value) {
+		minSoc(value) {
 			this.selectedMinSoc = value;
 		},
 	},
@@ -278,37 +296,40 @@ export default {
 		this.$refs.modal?.removeEventListener("hidden.bs.modal", this.modalInvisible);
 	},
 	methods: {
-		maxPowerPhases: function (phases) {
+		maxPowerPhases(phases) {
 			return this.fmtW(this.maxCurrent * V * phases);
 		},
-		minPowerPhases: function (phases) {
+		minPowerPhases(phases) {
 			return this.fmtW(this.minCurrent * V * phases);
 		},
-		formId: function (name) {
+		formId(name) {
 			return `loadpoint_${this.id}_${name}`;
 		},
-		changeMaxCurrent: function () {
+		changeMaxCurrent() {
 			this.$emit("maxcurrent-updated", this.selectedMaxCurrent);
 		},
-		changeMinCurrent: function () {
+		changeMinCurrent() {
 			this.$emit("mincurrent-updated", this.selectedMinCurrent);
 		},
-		changePhasesConfigured: function () {
+		changePhasesConfigured() {
 			this.$emit("phasesconfigured-updated", this.selectedPhases);
 		},
-		currentOption: function (value, isDefault) {
+		currentOption(value, isDefault) {
 			let name = `${this.fmtNumber(value)} A`;
 			if (isDefault) {
 				name += ` (${this.$t("main.loadpointSettings.default")})`;
 			}
 			return { value, name };
 		},
-		modalVisible: function () {
+		modalVisible() {
 			this.isModalVisible = true;
 		},
-		modalInvisible: function () {
+		modalInvisible() {
 			this.isModalVisible = false;
 		},
+		changeBatteryBoost(boost) {
+			this.$emit("batteryboost-updated", boost);
+		},
 	},
 };
 </script>
@@ -321,4 +342,8 @@ export default {
 .container h4:first-child {
 	margin-top: 0 !important;
 }
+
+.custom-select-inline {
+	display: inline-block !important;
+}
 </style>
diff --git a/assets/js/components/Loadpoints.vue b/assets/js/components/Loadpoints.vue
index 1c16858b98..5e932cb536 100644
--- a/assets/js/components/Loadpoints.vue
+++ b/assets/js/components/Loadpoints.vue
@@ -24,6 +24,7 @@
 					:multipleLoadpoints="loadpoints.length > 1"
 					:gridConfigured="gridConfigured"
 					:pvConfigured="pvConfigured"
+					:batteryConfigured="batteryConfigured"
 					class="h-100"
 					:class="{ 'loadpoint-unselected': !selected(index) }"
 					@click="scrollTo(index)"
@@ -60,7 +61,7 @@ import "@h2d2/shopicons/es/filled/lightning";
 import Loadpoint from "./Loadpoint.vue";
 
 export default {
-	name: "Site",
+	name: "Loadpoints",
 	components: { Loadpoint },
 	props: {
 		loadpoints: Array,
@@ -71,6 +72,7 @@ export default {
 		currency: String,
 		gridConfigured: Boolean,
 		pvConfigured: Boolean,
+		batteryConfigured: Boolean,
 	},
 	data() {
 		return { selectedIndex: 0, snapTimeout: null };
diff --git a/assets/js/components/MaterialIcon/BatteryBoost.vue b/assets/js/components/MaterialIcon/BatteryBoost.vue
new file mode 100644
index 0000000000..7eaab0c49b
--- /dev/null
+++ b/assets/js/components/MaterialIcon/BatteryBoost.vue
@@ -0,0 +1,23 @@
+<template>
+	<svg :style="svgStyle" viewBox="0 0 48 48">
+		<g id="Your_Icons">
+			<path
+				fill="currentColor"
+				d="M35,9.996l-3,0l0,-4c0,-1.097 -0.903,-2 -2,-2l-12,0c-1.097,0 -2,0.903 -2,2l0,4l-3,0c-1.097,0 -2,0.903 -2,2l0,30c0,1.097 0.903,2 2,2l22,0c1.097,0 2,-0.903 2,-2l0,-30c0,-1.097 -0.903,-2 -2,-2Zm-15,-2l8,-0l0,2l-8,-0l0,-2Zm13,32l-18,0l0,-26l18,0l0,26Z"
+			/>
+			<path
+				fill="currentColor"
+				d="M24.741,18.029c-0.395,-0.103 -0.812,0.073 -1.012,0.43l-5.077,9.05c-0.157,0.278 -0.154,0.619 0.008,0.895c0.162,0.275 0.458,0.445 0.777,0.445l3.727,-0l-0,6.251c-0,0.425 0.297,0.792 0.712,0.88c0.063,0.014 0.126,0.02 0.188,0.02c0.349,-0 0.675,-0.204 0.822,-0.534c0.966,-2.174 1.917,-4.395 2.823,-6.603c0.571,-1.394 1.142,-2.82 1.693,-4.237c0.108,-0.277 0.072,-0.589 -0.096,-0.834c-0.167,-0.245 -0.445,-0.392 -0.742,-0.392l-3.15,-0l-0,-4.5c-0,-0.41 -0.277,-0.767 -0.673,-0.871Z"
+			/>
+		</g>
+	</svg>
+</template>
+
+<script>
+import icon from "../../mixins/icon";
+
+export default {
+	name: "BatteryBoost",
+	mixins: [icon],
+};
+</script>
diff --git a/assets/js/components/Site.vue b/assets/js/components/Site.vue
index f53260ea11..57aad54d2c 100644
--- a/assets/js/components/Site.vue
+++ b/assets/js/components/Site.vue
@@ -31,6 +31,8 @@
 				:currency="currency"
 				:gridConfigured="gridConfigured"
 				:pvConfigured="pvConfigured"
+				:batteryConfigured="batteryConfigured"
+				:batterySoc="batterySoc"
 			/>
 			<Footer v-bind="footer"></Footer>
 		</div>
diff --git a/assets/js/components/Vehicle.vue b/assets/js/components/Vehicle.vue
index 3c54dfffeb..6f4aa92ee9 100644
--- a/assets/js/components/Vehicle.vue
+++ b/assets/js/components/Vehicle.vue
@@ -101,6 +101,7 @@ export default {
 		effectiveLimitSoc: Number,
 		effectivePlanSoc: Number,
 		effectivePlanTime: String,
+		batteryBoostActive: Boolean,
 		enabled: Boolean,
 		heating: Boolean,
 		id: [String, Number],
diff --git a/assets/js/components/VehicleStatus.vue b/assets/js/components/VehicleStatus.vue
index 37eaaa10b1..1da4bb8c3b 100644
--- a/assets/js/components/VehicleStatus.vue
+++ b/assets/js/components/VehicleStatus.vue
@@ -103,6 +103,7 @@
 				:class="smartCostClass"
 				data-testid="vehicle-status-smartcost"
 				data-bs-toggle="tooltip"
+				data-bs-trigger="hover"
 				@click="smartCostClicked"
 			>
 				<DynamicPriceIcon v-if="smartCostPrice" />
@@ -116,6 +117,18 @@
 				</div>
 			</button>
 
+			<!-- battery boost -->
+			<button
+				v-if="batteryBoostVisible"
+				ref="batteryBoost"
+				type="button"
+				class="entry"
+				data-testid="vehicle-status-batteryboost"
+				data-bs-toggle="tooltip"
+				@click="batteryBoostClicked"
+			>
+				<BatteryBoostIcon />
+			</button>
 			<!-- plan -->
 			<button
 				v-if="planActiveVisible"
@@ -170,7 +183,7 @@ import VehicleLimitReachedIcon from "./MaterialIcon/VehicleLimitReached.vue";
 import VehicleLimitWarningIcon from "./MaterialIcon/VehicleLimitWarning.vue";
 import VehicleMinSocIcon from "./MaterialIcon/VehicleMinSoc.vue";
 import WelcomeIcon from "./MaterialIcon/Welcome.vue";
-
+import BatteryBoostIcon from "./MaterialIcon/BatteryBoost.vue";
 const REASON_AUTH = "waitingforauthorization";
 const REASON_DISCONNECT = "disconnectrequired";
 
@@ -188,10 +201,12 @@ export default {
 		VehicleLimitIcon,
 		VehicleMinSocIcon,
 		WelcomeIcon,
+		BatteryBoostIcon,
 	},
 	mixins: [formatter],
 	props: {
 		vehicleSoc: Number,
+		batteryBoostActive: Boolean,
 		charging: Boolean,
 		chargingPlanDisabled: Boolean,
 		chargerStatusReason: String,
@@ -237,6 +252,7 @@ export default {
 			vehicleLimitTooltip: null,
 			awaitingAuthorizationTooltip: null,
 			disconnectRequiredTooltip: null,
+			batteryBoostTooltip: null,
 		};
 	},
 	mounted() {
@@ -251,6 +267,7 @@ export default {
 		this.updateVehicleLimitTooltip();
 		this.updateAwaitingAuthorizationTooltip();
 		this.updateDisconnectRequiredTooltip();
+		this.updateBatteryBoostTooltip();
 	},
 	watch: {
 		planActiveTooltipContent() {
@@ -286,6 +303,9 @@ export default {
 		disconnectRequiredTooltipContent() {
 			this.$nextTick(this.updateDisconnectRequiredTooltip);
 		},
+		batteryBoostTooltipContent() {
+			this.$nextTick(this.updateBatteryBoostTooltip);
+		},
 	},
 	computed: {
 		phaseTimerActive() {
@@ -395,6 +415,15 @@ export default {
 		planStartVisible() {
 			return this.planProjectedStart && !this.planActive && !this.chargingPlanDisabled;
 		},
+		batteryBoostVisible() {
+			return this.batteryBoostActive;
+		},
+		batteryBoostTooltipContent() {
+			if (!this.batteryBoostVisible) {
+				return "";
+			}
+			return this.$t("main.vehicleStatus.batteryBoost");
+		},
 		planStartTooltipContent() {
 			if (!this.planStartVisible) {
 				return "";
@@ -537,6 +566,10 @@ export default {
 			this.openLoadpointSettings();
 			this.smartCostTooltip?.hide();
 		},
+		batteryBoostClicked() {
+			this.batteryBoostTooltip?.hide();
+			this.openLoadpointSettings();
+		},
 		updatePvTooltip() {
 			this.pvTooltip = this.updateTooltip(
 				this.pvTooltip,
@@ -582,6 +615,13 @@ export default {
 				this.$refs.vehicleClimater
 			);
 		},
+		updateBatteryBoostTooltip() {
+			this.batteryBoostTooltip = this.updateTooltip(
+				this.batteryBoostTooltip,
+				this.batteryBoostTooltipContent,
+				this.$refs.batteryBoost
+			);
+		},
 		updateVehicleWelcomeTooltip() {
 			this.vehicleWelcomeTooltip = this.updateTooltip(
 				this.vehicleWelcomeTooltip,
diff --git a/core/loadpoint.go b/core/loadpoint.go
index 29eae02391..2a0a46bd13 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -666,6 +666,9 @@ func (lp *Loadpoint) Prepare(uiChan chan<- util.Param, pushChan chan<- push.Even
 	lp.publish(keys.LimitSoc, lp.limitSoc)
 	lp.publish(keys.LimitEnergy, lp.limitEnergy)
 
+	// battery boost
+	lp.publish(keys.BatteryBoost, lp.batteryBoost != boostDisabled)
+
 	// read initial charger state to prevent immediately disabling charger
 	if enabled, err := lp.charger.Enabled(); err == nil {
 		if lp.enabled = enabled; enabled {
@@ -1291,9 +1294,9 @@ func (lp *Loadpoint) publishTimer(name string, delay time.Duration, action strin
 }
 
 // boostPower returns the additional power that the loadpoint should draw from the battery
-func (lp *Loadpoint) boostPower(batteryBoostPower float64, batteryBuffered bool) float64 {
+func (lp *Loadpoint) boostPower(batteryBoostPower float64) float64 {
 	boost := lp.getBatteryBoost()
-	if boost == boostDisabled || !batteryBuffered {
+	if boost == boostDisabled {
 		return 0
 	}
 
@@ -1326,7 +1329,7 @@ func (lp *Loadpoint) pvMaxCurrent(mode api.ChargeMode, sitePower, batteryBoostPo
 	maxCurrent := lp.effectiveMaxCurrent()
 
 	// push demand to drain battery
-	sitePower -= lp.boostPower(batteryBoostPower, batteryBuffered)
+	sitePower -= lp.boostPower(batteryBoostPower)
 
 	// switch phases up/down
 	var scaledTo int
diff --git a/i18n/de.toml b/i18n/de.toml
index 8794e249be..b6b4566c56 100644
--- a/i18n/de.toml
+++ b/i18n/de.toml
@@ -432,6 +432,7 @@ remoteDisabledSoft = "{source}: Adaptives PV-Laden deaktiviert"
 solar = "Sonne"
 
 [main.loadpointSettings]
+batteryUsage = "Hausbatterie"
 currents = "Ladestrom"
 default = "default"
 disclaimerHint = "Hinweis:"
@@ -441,6 +442,12 @@ smartCostClean = "Grünes Netzladen"
 title = "Einstellungen {0}"
 vehicle = "Fahrzeug"
 
+[main.loadpointSettings.batteryBoost]
+description = "Schnell aus Hausbatterie laden."
+label = "Batterie Boost"
+mode = "Nur im PV- und Min+PV-Modus verfügbar."
+once = "Boost ist für diesen Ladevorgang aktiviert."
+
 [main.loadpointSettings.limitSoc]
 description = "Dieses Ladelimit wird verwendet, wenn das Fahrzeug angeschlossen wird."
 label = "Standard Ladelimit"
@@ -538,6 +545,7 @@ vehicleLimit = "Fahrzeuglimit: {soc}"
 
 [main.vehicleStatus]
 awaitingAuthorization = "Warte auf Autorisierung."
+batteryBoost = "Batterie Boost aktiv."
 charging = "Ladevorgang aktiv …"
 cheapEnergyCharging = "Günstige Energie verfügbar."
 cheapEnergyNextStart = "Günstige Energie in {duration}."
diff --git a/i18n/en.toml b/i18n/en.toml
index 1dc5cafb49..65a90327fc 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -430,6 +430,7 @@ remoteDisabledSoft = "{source}: turned off adaptive solar-charging"
 solar = "Solar"
 
 [main.loadpointSettings]
+batteryUsage = "Home Battery"
 currents = "Charging Current"
 default = "default"
 disclaimerHint = "Note:"
@@ -439,6 +440,12 @@ smartCostClean = "Clean Grid Charging"
 title = "Settings {0}"
 vehicle = "Vehicle"
 
+[main.loadpointSettings.batteryBoost]
+description = "Fast charge from home battery."
+label = "Battery Boost"
+mode = "Only available in solar and min+solar mode."
+once = "Boost active for this charging session."
+
 [main.loadpointSettings.limitSoc]
 description = "Charging limit that is used when this vehicle is connected."
 label = "Default limit"
@@ -536,6 +543,7 @@ vehicleLimit = "Vehicle limit: {soc}"
 
 [main.vehicleStatus]
 awaitingAuthorization = "Waiting for authorization."
+batteryBoost = "Battery boost active."
 charging = "Charging…"
 cheapEnergyCharging = "Cheap energy available."
 cheapEnergyNextStart = "Cheap energy in {duration}."
diff --git a/tests/battery-settings.spec.js b/tests/battery-settings.spec.js
index 1b56a83af9..42fe67c253 100644
--- a/tests/battery-settings.spec.js
+++ b/tests/battery-settings.spec.js
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test";
 import { start, stop, baseUrl } from "./evcc";
-
+import { enableExperimental } from "./utils";
 test.use({ baseURL: baseUrl() });
 
 test.beforeAll(async () => {
@@ -10,14 +10,6 @@ test.afterAll(async () => {
   await stop();
 });
 
-async function enableExperimental(page) {
-  await page.getByTestId("topnavigation-button").click();
-  await page.getByTestId("topnavigation-settings").click();
-  await page.getByLabel("Experimental 🧪").click();
-  await page.getByRole("button", { name: "Close" }).click();
-  await expect(page.locator(".modal-backdrop")).not.toBeVisible();
-}
-
 test.describe("battery settings", async () => {
   test("open modal", async ({ page }) => {
     await page.goto("/");
diff --git a/tests/boot.spec.js b/tests/boot.spec.js
new file mode 100644
index 0000000000..0b2e983a02
--- /dev/null
+++ b/tests/boot.spec.js
@@ -0,0 +1,54 @@
+import { test, expect } from "@playwright/test";
+import { start, stop, baseUrl } from "./evcc";
+import { enableExperimental } from "./utils";
+test.use({ baseURL: baseUrl() });
+
+test.beforeAll(async () => {
+  await start("battery-settings.evcc.yaml", "password.sql");
+});
+test.afterAll(async () => {
+  await stop();
+});
+
+test.beforeEach(async ({ page }) => {
+  await page.goto("/");
+});
+
+test.describe("boost", async () => {
+  test("not visible when not experimental", async ({ page }) => {
+    await expect(page.getByTestId("vehicle-status-batteryboost")).not.toBeVisible();
+    await page.getByTestId("loadpoint-settings-button").nth(1).click();
+    const modal = page.getByTestId("loadpoint-settings-modal");
+    await expect(modal.getByTestId("battery-boost")).not.toBeVisible();
+  });
+
+  test("activate boost in solar mode", async ({ page }) => {
+    await enableExperimental(page);
+    await expect(page.getByTestId("vehicle-status-batteryboost")).not.toBeVisible();
+    await page
+      .getByTestId("mode")
+      .first()
+      .getByRole("button", { name: "Solar", exact: true })
+      .click();
+    await page.getByTestId("loadpoint-settings-button").nth(1).click();
+    const modal = page.getByTestId("loadpoint-settings-modal");
+    await modal.getByTestId("battery-boost").getByTestId("battery-boost-checkbox").click();
+    await expect(modal.getByTestId("battery-boost")).toContainText(
+      "Boost active for this charging session."
+    );
+    await modal.getByLabel("Close").click();
+    await expect(modal).not.toBeVisible();
+    await expect(page.getByTestId("vehicle-status-batteryboost")).toBeVisible();
+  });
+
+  test("disabled in fast mode", async ({ page }) => {
+    await enableExperimental(page);
+    await page.getByTestId("mode").first().getByRole("button", { name: "Fast" }).click();
+    await page.getByTestId("loadpoint-settings-button").nth(1).click();
+    const modal = page.getByTestId("loadpoint-settings-modal");
+    await expect(modal.getByTestId("battery-boost-checkbox")).toBeDisabled();
+    await expect(modal.getByTestId("battery-boost")).toContainText(
+      "Only available in solar and min+solar mode."
+    );
+  });
+});
diff --git a/tests/config-battery.spec.js b/tests/config-battery.spec.js
index 1c08320fdb..2a86c64170 100644
--- a/tests/config-battery.spec.js
+++ b/tests/config-battery.spec.js
@@ -1,6 +1,7 @@
 import { test, expect } from "@playwright/test";
 import { start, stop, restart, baseUrl } from "./evcc";
 import { startSimulator, stopSimulator, simulatorUrl, simulatorHost } from "./simulator";
+import { enableExperimental, login } from "./utils";
 
 const CONFIG_GRID_ONLY = "config-grid-only.evcc.yaml";
 
@@ -15,21 +16,6 @@ test.afterAll(async () => {
   await stopSimulator();
 });
 
-async function login(page) {
-  await page.locator("#loginPassword").fill("secret");
-  await page.getByRole("button", { name: "Login" }).click();
-  await expect(page.locator("#loginPassword")).not.toBeVisible();
-}
-
-async function enableExperimental(page) {
-  await page
-    .getByTestId("generalconfig-experimental")
-    .getByRole("button", { name: "edit" })
-    .click();
-  await page.getByLabel("Experimental 🧪").click();
-  await page.getByRole("button", { name: "Close" }).click();
-}
-
 test.describe("battery meter", async () => {
   test("create, edit and remove battery meter", async ({ page }) => {
     // setup test data for mock openems api
diff --git a/tests/config-grid.spec.js b/tests/config-grid.spec.js
index 75ec5c263d..dac01b1a02 100644
--- a/tests/config-grid.spec.js
+++ b/tests/config-grid.spec.js
@@ -1,6 +1,7 @@
 import { test, expect } from "@playwright/test";
 import { start, stop, restart, baseUrl } from "./evcc";
 import { startSimulator, stopSimulator, simulatorUrl, simulatorHost } from "./simulator";
+import { enableExperimental, login } from "./utils";
 
 const CONFIG_EMPTY = "config-empty.evcc.yaml";
 
@@ -15,21 +16,6 @@ test.afterAll(async () => {
   await stopSimulator();
 });
 
-async function login(page) {
-  await page.locator("#loginPassword").fill("secret");
-  await page.getByRole("button", { name: "Login" }).click();
-  await expect(page.locator("#loginPassword")).not.toBeVisible();
-}
-
-async function enableExperimental(page) {
-  await page
-    .getByTestId("generalconfig-experimental")
-    .getByRole("button", { name: "edit" })
-    .click();
-  await page.getByLabel("Experimental 🧪").click();
-  await page.getByRole("button", { name: "Close" }).click();
-}
-
 test.describe("main screen", async () => {
   test("modes", async ({ page }) => {
     await page.goto("/");
diff --git a/tests/config-messaging.spec.js b/tests/config-messaging.spec.js
index bf03761d0e..fa7fe88a0f 100644
--- a/tests/config-messaging.spec.js
+++ b/tests/config-messaging.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from "@playwright/test";
 import { start, stop, baseUrl } from "./evcc";
+import { enableExperimental, login } from "./utils";
 
 const CONFIG_GRID_ONLY = "config-grid-only.evcc.yaml";
 
@@ -11,22 +12,6 @@ test.afterEach(async () => {
 
 const SELECT_ALL = "ControlOrMeta+KeyA";
 
-async function login(page) {
-  await page.locator("#loginPassword").fill("secret");
-  await page.getByRole("button", { name: "Login" }).click();
-  await expect(page.locator("#loginPassword")).not.toBeVisible();
-}
-
-async function enableExperimental(page) {
-  await page
-    .getByTestId("generalconfig-experimental")
-    .getByRole("button", { name: "edit" })
-    .click();
-  await page.getByLabel("Experimental 🧪").click();
-  await page.getByRole("button", { name: "Close" }).click();
-  await expect(page.locator(".modal-backdrop")).not.toBeVisible();
-}
-
 async function goToConfig(page) {
   await page.goto("/#/config");
   await login(page);
diff --git a/tests/config-mqtt.spec.js b/tests/config-mqtt.spec.js
index 284655ac0c..d2dacaba63 100644
--- a/tests/config-mqtt.spec.js
+++ b/tests/config-mqtt.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from "@playwright/test";
 import { start, stop, restart, baseUrl } from "./evcc";
+import { enableExperimental, login } from "./utils";
 
 const CONFIG = "config-grid-only.evcc.yaml";
 
@@ -16,22 +17,6 @@ test.beforeEach(async ({ page }) => {
 test.afterEach(async () => {
   await stop();
 });
-
-async function login(page) {
-  await page.locator("#loginPassword").fill("secret");
-  await page.getByRole("button", { name: "Login" }).click();
-  await expect(page.locator("#loginPassword")).not.toBeVisible();
-}
-
-async function enableExperimental(page) {
-  await page
-    .getByTestId("generalconfig-experimental")
-    .getByRole("button", { name: "edit" })
-    .click();
-  await page.getByLabel("Experimental 🧪").click();
-  await page.getByRole("button", { name: "Close" }).click();
-}
-
 test.describe("mqtt", async () => {
   test("mqtt not configured", async ({ page }) => {
     await expect(page.getByTestId("mqtt")).toBeVisible();
diff --git a/tests/config-tariffs.spec.js b/tests/config-tariffs.spec.js
index 992730fb57..fa554a04ae 100644
--- a/tests/config-tariffs.spec.js
+++ b/tests/config-tariffs.spec.js
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test";
 import { start, stop, restart, baseUrl } from "./evcc";
-
+import { enableExperimental, login } from "./utils";
 const CONFIG_GRID_ONLY = "config-grid-only.evcc.yaml";
 const CONFIG_WITH_TARIFFS = "config-with-tariffs.evcc.yaml";
 
@@ -13,21 +13,6 @@ test.afterEach(async () => {
 
 const SELECT_ALL = "ControlOrMeta+KeyA";
 
-async function login(page) {
-  await page.locator("#loginPassword").fill("secret");
-  await page.getByRole("button", { name: "Login" }).click();
-  await expect(page.locator("#loginPassword")).not.toBeVisible();
-}
-
-async function enableExperimental(page) {
-  await page
-    .getByTestId("generalconfig-experimental")
-    .getByRole("button", { name: "edit" })
-    .click();
-  await page.getByLabel("Experimental 🧪").click();
-  await page.getByRole("button", { name: "Close" }).click();
-}
-
 async function goToConfig(page) {
   await page.goto("/#/config");
   await login(page);
diff --git a/tests/config-vehicles.spec.js b/tests/config-vehicles.spec.js
index 55b423b3ff..d153f777f0 100644
--- a/tests/config-vehicles.spec.js
+++ b/tests/config-vehicles.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from "@playwright/test";
-import { start, stop, restart, cleanRestart, baseUrl } from "./evcc";
+import { start, stop, restart, baseUrl } from "./evcc";
+import { enableExperimental, login } from "./utils";
 
 const CONFIG_GRID_ONLY = "config-grid-only.evcc.yaml";
 const CONFIG_WITH_VEHICLE = "config-with-vehicle.evcc.yaml";
@@ -11,21 +12,6 @@ test.afterEach(async () => {
   await stop();
 });
 
-async function login(page) {
-  await page.locator("#loginPassword").fill("secret");
-  await page.getByRole("button", { name: "Login" }).click();
-  await expect(page.locator("#loginPassword")).not.toBeVisible();
-}
-
-async function enableExperimental(page) {
-  await page
-    .getByTestId("generalconfig-experimental")
-    .getByRole("button", { name: "edit" })
-    .click();
-  await page.getByLabel("Experimental 🧪").click();
-  await page.getByRole("button", { name: "Close" }).click();
-}
-
 test.describe("vehicles", async () => {
   test("create, edit and delete vehicles", async ({ page }) => {
     await start(CONFIG_GRID_ONLY, "password.sql");
diff --git a/tests/config.spec.js b/tests/config.spec.js
index fb2a72134f..08329a84eb 100644
--- a/tests/config.spec.js
+++ b/tests/config.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from "@playwright/test";
 import { start, stop, baseUrl } from "./evcc";
+import { enableExperimental, login } from "./utils";
 
 const CONFIG_GRID_ONLY = "config-grid-only.evcc.yaml";
 
@@ -12,21 +13,6 @@ test.afterAll(async () => {
   await stop();
 });
 
-async function login(page) {
-  await page.locator("#loginPassword").fill("secret");
-  await page.getByRole("button", { name: "Login" }).click();
-  await expect(page.locator("#loginPassword")).not.toBeVisible();
-}
-
-async function enableExperimental(page) {
-  await page
-    .getByTestId("generalconfig-experimental")
-    .getByRole("button", { name: "edit" })
-    .click();
-  await page.getByLabel("Experimental 🧪").click();
-  await page.getByRole("button", { name: "Close" }).click();
-}
-
 test.describe("basics", async () => {
   test("navigation to config", async ({ page }) => {
     await page.goto("/");
diff --git a/tests/logs.spec.js b/tests/logs.spec.js
index 09cbace68d..3d21c0f6b2 100644
--- a/tests/logs.spec.js
+++ b/tests/logs.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from "@playwright/test";
 import { start, stop, baseUrl } from "./evcc";
+import { login } from "./utils";
 
 test.use({ baseURL: baseUrl() });
 
@@ -10,12 +11,6 @@ test.afterAll(async () => {
   await stop();
 });
 
-async function login(page) {
-  await page.locator("#loginPassword").fill("secret");
-  await page.getByRole("button", { name: "Login" }).click();
-  await expect(page.locator("#loginPassword")).not.toBeVisible();
-}
-
 test.describe("opening logs", async () => {
   test("via config", async ({ page }) => {
     await page.goto("/");
diff --git a/tests/modals.spec.js b/tests/modals.spec.js
index ddcbe85f07..7a7049e6e2 100644
--- a/tests/modals.spec.js
+++ b/tests/modals.spec.js
@@ -1,6 +1,7 @@
 import { test, expect } from "@playwright/test";
 import { start, stop, baseUrl } from "./evcc";
 import { startSimulator, stopSimulator, simulatorConfig } from "./simulator";
+import { login } from "./utils";
 
 const BASICS_CONFIG = "basics.evcc.yaml";
 
@@ -8,12 +9,6 @@ const UI_ROUTES = ["/", "/#/sessions", "/#/config"];
 
 test.use({ baseURL: baseUrl() });
 
-async function login(page) {
-  await page.locator("#loginPassword").fill("secret");
-  await page.getByRole("button", { name: "Login" }).click();
-  await expect(page.locator("#loginPassword")).not.toBeVisible();
-}
-
 test.describe("Basics", async () => {
   test.beforeAll(async () => {
     await start(BASICS_CONFIG, "password.sql");
diff --git a/tests/utils.js b/tests/utils.js
new file mode 100644
index 0000000000..9a9fc2f09c
--- /dev/null
+++ b/tests/utils.js
@@ -0,0 +1,15 @@
+import { expect } from "@playwright/test";
+
+export async function enableExperimental(page) {
+  await page.getByTestId("topnavigation-button").click();
+  await page.getByTestId("topnavigation-settings").click();
+  await page.getByLabel("Experimental 🧪").click();
+  await page.getByRole("button", { name: "Close" }).click();
+  await expect(page.locator(".modal-backdrop")).not.toBeVisible();
+}
+
+export async function login(page) {
+  await page.locator("#loginPassword").fill("secret");
+  await page.getByRole("button", { name: "Login" }).click();
+  await expect(page.locator("#loginPassword")).not.toBeVisible();
+}