diff --git a/tariff/template_test.go b/tariff/template_test.go
index 4886f5a29..429efad99 100644
--- a/tariff/template_test.go
+++ b/tariff/template_test.go
@@ -7,7 +7,12 @@ import (
 	"github.com/evcc-io/evcc/util/test"
 )
 
-var acceptable = []string{}
+var acceptable = []string{
+	"missing token",         // amber, tibber
+	"invalid zipcode",       // grünstromindex
+	"invalid apikey format", // octopusenergy
+	"missing region",        // octopusenergy
+}
 
 func TestTemplates(t *testing.T) {
 	templates.TestClass(t, templates.Tariff, func(t *testing.T, values map[string]any) {
diff --git a/util/templates/render_testing.go b/util/templates/render_testing.go
index 17b272c88..5ad7b912c 100644
--- a/util/templates/render_testing.go
+++ b/util/templates/render_testing.go
@@ -69,7 +69,7 @@ func TestClass(t *testing.T, class Class, instantiate func(t *testing.T, values
 				})
 			})
 
-			return
+			continue
 		}
 
 		for _, u := range usages {
diff --git a/vehicle/template_test.go b/vehicle/template_test.go
index c7f3a544d..a9780a1c7 100644
--- a/vehicle/template_test.go
+++ b/vehicle/template_test.go
@@ -22,6 +22,9 @@ var acceptable = []string{
 	"missing credentials",    // Tesla
 	"missing credentials id", // Tronity
 	"missing access and/or refresh token, use `evcc token` to create", // Tesla
+	"login failed: code not found",                                    //Polestar
+	"empty instance type- check for missing usage",                    // Merces
+	"invalid vehicle type: tesla",                                     //Tesla
 }
 
 func TestTemplates(t *testing.T) {