diff --git a/e2e/test_flows_enroll.py b/e2e/test_flows_enroll.py
index bbfb53047..ca21b3a09 100644
--- a/e2e/test_flows_enroll.py
+++ b/e2e/test_flows_enroll.py
@@ -23,8 +23,8 @@ class TestFlowsEnroll(SeleniumTestCase):
     """Test Enroll flow"""
 
     def setUp(self):
-        super().setUp()
         self.container = self.setup_client()
+        super().setUp()
 
     def setup_client(self) -> Container:
         """Setup test IdP container"""
diff --git a/e2e/test_provider_oauth.py b/e2e/test_provider_oauth.py
index 77fdb4e25..622ac9cdb 100644
--- a/e2e/test_provider_oauth.py
+++ b/e2e/test_provider_oauth.py
@@ -20,10 +20,10 @@ class TestProviderOAuth(SeleniumTestCase):
     """test OAuth Provider flow"""
 
     def setUp(self):
-        super().setUp()
         self.client_id = generate_client_id()
         self.client_secret = generate_client_secret()
         self.container = self.setup_client()
+        super().setUp()
 
     def setup_client(self) -> Container:
         """Setup client grafana container which we test OAuth against"""
diff --git a/e2e/test_provider_oidc.py b/e2e/test_provider_oidc.py
index 7b8b29b22..d143591b4 100644
--- a/e2e/test_provider_oidc.py
+++ b/e2e/test_provider_oidc.py
@@ -23,10 +23,10 @@ class TestProviderOIDC(SeleniumTestCase):
     """test OpenID Provider flow"""
 
     def setUp(self):
-        super().setUp()
         self.client_id = generate_client_id()
         self.client_secret = generate_client_secret()
         self.container = self.setup_client()
+        super().setUp()
 
     def setup_client(self) -> Container:
         """Setup client grafana container which we test OIDC against"""
diff --git a/e2e/test_source_saml.py b/e2e/test_source_saml.py
index 599d092a9..61fd41967 100644
--- a/e2e/test_source_saml.py
+++ b/e2e/test_source_saml.py
@@ -40,8 +40,8 @@ class TestSourceSAML(SeleniumTestCase):
     """test SAML Source flow"""
 
     def setUp(self):
-        super().setUp()
         self.container = self.setup_client()
+        super().setUp()
 
     def setup_client(self) -> Container:
         """Setup test IdP container"""
diff --git a/e2e/test_sources_oauth.py b/e2e/test_sources_oauth.py
index d257928cb..b9dafa20a 100644
--- a/e2e/test_sources_oauth.py
+++ b/e2e/test_sources_oauth.py
@@ -25,9 +25,9 @@ class TestSourceOAuth(SeleniumTestCase):
     container: Container
 
     def setUp(self):
-        super().setUp()
         self.client_secret = generate_client_secret()
         self.container = self.setup_client()
+        super().setUp()
 
     def prepare_dex_config(self):
         """Since Dex does not document which environment