diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
index 8db4c92407c..a37a6f13d14 100644
--- a/test/e2e/e2e.go
+++ b/test/e2e/e2e.go
@@ -183,9 +183,7 @@ func setupSuite(ctx context.Context) {
 	}
 
 	c, err := framework.LoadClientset()
-	if err != nil {
-		klog.Fatal("Error loading client: ", err)
-	}
+	framework.ExpectNoError(err, "Error loading client")
 
 	// Delete any namespaces except those created by the system. This ensures no
 	// lingering resources are left over from a previous test run.
@@ -380,9 +378,7 @@ func setupSuitePerGinkgoNode(ctx context.Context) {
 	// the dual stack clusters can be ipv4-ipv6 or ipv6-ipv4, order matters,
 	// and services use the primary IP family by default
 	c, err := framework.LoadClientset()
-	if err != nil {
-		klog.Fatal("Error loading client: ", err)
-	}
+	framework.ExpectNoError(err, "Error loading client")
 	framework.TestContext.IPFamily = getDefaultClusterIPFamily(ctx, c)
 	framework.Logf("Cluster IP family: %s", framework.TestContext.IPFamily)
 }
diff --git a/test/e2e/framework/test_context.go b/test/e2e/framework/test_context.go
index 3f1622dc877..6ffb4d18bf3 100644
--- a/test/e2e/framework/test_context.go
+++ b/test/e2e/framework/test_context.go
@@ -549,9 +549,7 @@ func AfterReadingAllFlags(t *TestContextType) {
 	if len(t.BearerToken) == 0 {
 		var err error
 		t.BearerToken, err = GenerateSecureToken(16)
-		if err != nil {
-			klog.Fatalf("Failed to generate bearer token: %v", err)
-		}
+		ExpectNoError(err, "Failed to generate bearer token")
 	}
 
 	// Allow 1% of nodes to be unready (statistically) - relevant for large clusters.