diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
index 3f4d44b..5a0976a 100644
--- a/test/e2e/e2e_suite_test.go
+++ b/test/e2e/e2e_suite_test.go
@@ -17,13 +17,31 @@ limitations under the License.
 package e2e
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
+	"github.com/aenix-io/etcd-operator/internal/log"
+	"github.com/go-logr/logr"
+	logctrl "sigs.k8s.io/controller-runtime/pkg/log"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
+var ctx context.Context
+
+var _ = BeforeSuite(func() {
+	ctx = log.Setup(context.TODO(), log.Parameters{
+		LogLevel:        "error",
+		StacktraceLevel: "error",
+		Development:     true,
+	})
+
+	// This line prevents controller-runtime from complaining about log.SetLogger never being called
+	logctrl.SetLogger(logr.FromContextOrDiscard(ctx))
+})
+
 // Run e2e tests using the Ginkgo runner.
 func TestE2E(t *testing.T) {
 	RegisterFailHandler(Fail)
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index 7cbe957..c996785 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package e2e
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"os/exec"
@@ -28,16 +27,9 @@ import (
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/aenix-io/etcd-operator/internal/log"
 	"github.com/aenix-io/etcd-operator/test/utils"
 )
 
-var ctx = log.Setup(context.TODO(), log.Parameters{
-	LogLevel:        "error",
-	StacktraceLevel: "error",
-	Development:     true,
-})
-
 var _ = Describe("etcd-operator", Ordered, func() {
 
 	BeforeAll(func() {