diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 566ccbe955..6ae6944c76 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -134,6 +134,7 @@ jobs:
         mode:
           - plugin
           - standalone
+          - cucumber
     steps:
       -
         name: Checkout
@@ -186,6 +187,11 @@ jobs:
           rm -f /usr/local/bin/docker-compose
           cp bin/build/docker-compose /usr/local/bin
           make e2e-compose-standalone
+      -
+        name: Run cucumber tests
+        if: ${{ matrix.mode == 'cucumber'}}
+        run: |
+          make test-cucumber
 
   release:
     permissions:
diff --git a/Makefile b/Makefile
index e36be81d8e..153a136c26 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,10 @@ e2e-compose: ## Run end to end local tests in plugin mode. Set E2E_TEST=TestName
 e2e-compose-standalone: ## Run End to end local tests in standalone mode. Set E2E_TEST=TestName to run a single test
 	go test $(TEST_FLAGS) -v -count=1 -parallel=1 --tags=standalone ./pkg/e2e
 
+.PHONY: test-cucumber
+test-cucumber:
+	go test $(TEST_FLAGS) -v -count=1 -parallel=1 ./e2e
+
 .PHONY: build-and-e2e-compose
 build-and-e2e-compose: build e2e-compose ## Compile the compose cli-plugin and run end to end local tests in plugin mode. Set E2E_TEST=TestName to run a single test