diff --git a/test/e2e/fishapp/dynamic_stack_test.go b/test/e2e/fishapp/dynamic_stack_test.go
index a8ded939..01d0116f 100644
--- a/test/e2e/fishapp/dynamic_stack_test.go
+++ b/test/e2e/fishapp/dynamic_stack_test.go
@@ -3,22 +3,20 @@ package fishapp_test
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/aws/aws-app-mesh-controller-for-k8s/test/e2e/fishapp"
-	"github.com/aws/aws-app-mesh-controller-for-k8s/test/framework"
 	"github.com/aws/aws-app-mesh-controller-for-k8s/test/framework/manifest"
 	. "github.com/onsi/ginkgo"
-	"time"
 )
 
 var _ = Describe("test dynamically generated symmetrical mesh", func() {
 	var (
 		ctx context.Context
-		f   *framework.Framework
 	)
 
 	BeforeEach(func() {
 		ctx = context.Background()
-		f = framework.New(framework.GlobalOptions)
 
 		if f.Options.ControllerImage != "" {
 			By("Reset cluster with default controller", func() {
diff --git a/test/e2e/fishapp/fishapp_suite_test.go b/test/e2e/fishapp/fishapp_suite_test.go
index 3a705f98..8b53b1aa 100644
--- a/test/e2e/fishapp/fishapp_suite_test.go
+++ b/test/e2e/fishapp/fishapp_suite_test.go
@@ -3,11 +3,20 @@ package fishapp_test
 import (
 	"testing"
 
+	"github.com/aws/aws-app-mesh-controller-for-k8s/test/framework"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
+var f *framework.Framework
+
 func TestFishApp(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "FishApp Suite")
 }
+
+var _ = BeforeSuite(func() {
+	var err error
+	f = framework.New(framework.GlobalOptions)
+	Expect(err).NotTo(HaveOccurred())
+})