diff --git a/test/functional/base_test.go b/test/functional/base_test.go
index c645bc25..e3542e49 100644
--- a/test/functional/base_test.go
+++ b/test/functional/base_test.go
@@ -36,7 +36,7 @@ import (
 )
 
 const (
-	timeout                = 20 * time.Second
+	timeout                = 45 * time.Second
 	interval               = 20 * time.Millisecond
 	DatabaseHostname       = "databasehost.example.org"
 	DatabaseInstance       = "openstack"
diff --git a/test/functional/suite_test.go b/test/functional/suite_test.go
index b47b8e51..69e74f5c 100644
--- a/test/functional/suite_test.go
+++ b/test/functional/suite_test.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"path/filepath"
 	"testing"
+	"time"
 
 	"github.com/go-logr/logr"
 	"github.com/google/uuid"
@@ -111,6 +112,10 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
+		// Increase this to 60 or 120 seconds for the single-core run
+		ControlPlaneStartTimeout: 120 * time.Second,
+		// Give it plenty of time to wind down (e.g., 60-120 seconds)
+		ControlPlaneStopTimeout: 120 * time.Second,
 		CRDDirectoryPaths: []string{
 			filepath.Join("..", "..", "config", "crd", "bases"),
 			keystoneCRDs,
@@ -126,6 +131,14 @@ var _ = BeforeSuite(func() {
 			// failing on the colons in ::1
 			LocalServingHost: "127.0.0.1",
 		},
+		ControlPlane: envtest.ControlPlane{
+			APIServer: &envtest.APIServer{
+				Args: []string{
+					"--service-cluster-ip-range=10.0.0.0/12", // 65k+ IPs
+					"--disable-admission-plugins=ResourceQuota,ServiceAccount,NamespaceLifecycle",
+				},
+			},
+		},
 	}
 
 	// cfg is defined in this file globally.