diff --git a/client_test.go b/client_test.go
index 5ec6197c..04162f13 100644
--- a/client_test.go
+++ b/client_test.go
@@ -3,6 +3,7 @@ package stackit
 import (
 	"context"
 	"net/http"
+	"os"
 	"reflect"
 	"testing"
 	"time"
@@ -11,6 +12,13 @@ import (
 )
 
 func TestNew(t *testing.T) {
+	eml := os.Getenv("STACKIT_SERVICE_ACCOUNT_EMAIL")
+	tok := os.Getenv("STACKIT_SERVICE_ACCOUNT_TOKEN")
+	env := os.Getenv("STACKIT_ENV")
+	os.Setenv("STACKIT_SERVICE_ACCOUNT_EMAIL", "")
+	os.Setenv("STACKIT_SERVICE_ACCOUNT_TOKEN", "")
+	os.Setenv("STACKIT_ENV", "")
+
 	cfg := Config{
 		ServiceAccountToken: "token",
 		ServiceAccountEmail: "sa-id",
@@ -41,6 +49,9 @@ func TestNew(t *testing.T) {
 			}
 		})
 	}
+	os.Setenv("STACKIT_SERVICE_ACCOUNT_EMAIL", eml)
+	os.Setenv("STACKIT_SERVICE_ACCOUNT_TOKEN", tok)
+	os.Setenv("STACKIT_ENV", env)
 }
 
 func TestClient_DoWithRetry(t *testing.T) {
diff --git a/internal/clients/clients.go b/internal/clients/clients.go
index f59af1d2..7261905f 100644
--- a/internal/clients/clients.go
+++ b/internal/clients/clients.go
@@ -22,7 +22,7 @@ func LocalClient() (*client.Client, error) {
 		return nil, errors.New("STACKIT_SERVICE_ACCOUNT_TOKEN is missing from env variables")
 	}
 
-	return client.New(context.Background(), client.Config{
+	return client.NewClientWithConfig(context.Background(), client.Config{
 		ServiceAccountEmail: aid,
 		ServiceAccountToken: ato,
 	})