diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index ef2f8556f..ccf51b143 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -29,6 +29,9 @@ on:
   pull_request:
     branches:
       - main
+  push:
+    branches:
+      - main
 
 env:
   ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }}
diff --git a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/TestSuite.kt b/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/TestSuite.kt
index 1b7340cf1..1cbd0db80 100644
--- a/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/TestSuite.kt
+++ b/tests/end-to-end/src/test/kotlin/io/iohk/atala/prism/TestSuite.kt
@@ -1,9 +1,9 @@
 package io.iohk.atala.prism
 
+import io.cucumber.java.BeforeAll
 import io.cucumber.junit.CucumberOptions
 import io.iohk.atala.prism.configuration.Environment
 import net.serenitybdd.cucumber.CucumberWithSerenity
-import org.junit.BeforeClass
 import org.junit.runner.RunWith
 
 @RunWith(CucumberWithSerenity::class)
@@ -11,13 +11,10 @@ import org.junit.runner.RunWith
     features = ["src/test/resources/features"],
     plugin = ["pretty"]
 )
-class TestSuite {
-    companion object {
-        @JvmStatic
-        @BeforeClass
-        fun setupEnvironment() {
-            Environment.setup()
-        }
-    }
-}
+class TestSuite
 
+// https://cucumber.io/docs/cucumber/api/?lang=kotlin
+@BeforeAll
+fun setupEnvironment() {
+    Environment.setup()
+}