diff --git a/Makefile b/Makefile
index f74893f14..ed6025631 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ test-e2e-preinstalled: check-env-vars check-avn-client ## Run end-to-end tests u
 
 test: envtest ## Run tests. To target a specific test, use 'run=TestName make test'.
 	export KUBEBUILDER_ASSETS=$(shell eval ${KUBEBUILDER_ASSETS_CMD}); \
-	go test ./tests/... -race -run=$(run) -v $(if $(run), -timeout 10m, -timeout 42m) -parallel 10 -cover -coverpkg=./controllers -covermode=atomic -coverprofile=coverage.out
+	go test ./tests/... -race -run=$(run) -v $(if $(run), -timeout 20m, -timeout 90m) -parallel 10 -cover -coverpkg=./controllers -covermode=atomic -coverprofile=coverage.out
 
 ##@ Build
 
diff --git a/tests/session.go b/tests/session.go
index e22a45d07..942a23ced 100644
--- a/tests/session.go
+++ b/tests/session.go
@@ -29,7 +29,7 @@ import (
 const (
 	retryInterval      = time.Second * 10
 	createTimeout      = time.Second * 15
-	waitRunningTimeout = time.Minute * 10
+	waitRunningTimeout = time.Minute * 20
 	yamlBufferSize     = 100
 	defaultNamespace   = "default"
 )