diff --git a/vehicle/config_test.go b/vehicle/config_test.go
index 10421bd84..edb0fa498 100644
--- a/vehicle/config_test.go
+++ b/vehicle/config_test.go
@@ -18,8 +18,8 @@ func TestVehicles(t *testing.T) {
 		"Missing required parameter", // Renault
 		"error connecting: Network Error",
 		"unexpected status: 401",
-		"could not obtain token",        // Porsche
-		"login failed: 400 Bad Request", // Tesla
+		"could not obtain token", // Porsche
+		"missing credentials",    // Tesla
 	}
 
 	for _, tmpl := range test.ConfigTemplates("vehicle") {
diff --git a/vehicle/tesla.go b/vehicle/tesla.go
index 923419e27..a61af460a 100644
--- a/vehicle/tesla.go
+++ b/vehicle/tesla.go
@@ -50,6 +50,10 @@ func NewTeslaFromConfig(other map[string]interface{}) (api.Vehicle, error) {
 		return nil, err
 	}
 
+	if cc.User == "" && cc.Tokens.Access == "" {
+		return nil, errors.New("missing credentials")
+	}
+
 	v := &Tesla{
 		embed: &embed{cc.Title, cc.Capacity},
 	}