diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml
index 07e82ce651..ca3dd168e3 100644
--- a/.github/workflows/automated-tests.yml
+++ b/.github/workflows/automated-tests.yml
@@ -28,31 +28,3 @@ jobs:
         run: make proto-check
       - name: Unit, integration and difference tests
         run: go test ./...
-  E2E_Tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          lfs: true
-      - name: Checkout LFS objects
-        run: git lfs checkout
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.20"
-      - name: E2E tests
-        run: make test-e2e-short
-  Cometmock_Tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          lfs: true
-      - name: Checkout LFS objects
-        run: git lfs checkout
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.20"
-      - name: E2E tests
-        run: make test-e2e-short-cometmock
diff --git a/.github/workflows/e2e-happy-path.yml b/.github/workflows/e2e-happy-path.yml
index 076bb2af08..f782d48443 100644
--- a/.github/workflows/e2e-happy-path.yml
+++ b/.github/workflows/e2e-happy-path.yml
@@ -11,10 +11,9 @@ on:
       - release/v*
       - feat/*
 jobs:
-  e2e-happy-path:
+  E2E_Tests:
     runs-on: ubuntu-latest
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
         with:
           lfs: true
@@ -23,8 +22,20 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20" # The Go version to download (if necessary) and use.
-      - name: Proto Check
-        run: make proto-check
+          go-version: "1.20"
       - name: E2E tests
-        run: make test-e2e-short
\ No newline at end of file
+        run: make test-e2e-short
+  Cometmock_Tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          lfs: true
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - name: E2E tests
+        run: make test-e2e-short-cometmock