diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/e2e-tests.yml
similarity index 78%
rename from .github/workflows/automated-tests.yml
rename to .github/workflows/e2e-tests.yml
index da3d3df042..fb5a54e22e 100644
--- a/.github/workflows/automated-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -1,4 +1,4 @@
-name: Automated Tests
+name: E2E Tests
 on:
   push:
     branches:
@@ -9,7 +9,7 @@ on:
       - main
       - release/v*
 jobs:
-  Automated_Tests:
+  E2E_Tests:
     runs-on: ubuntu-latest
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -23,8 +23,6 @@ jobs:
         with:
           go-version: "1.19" # The Go version to download (if necessary) and use.
 
-      - name: Unit, integration and difference tests
-        run: go test ./...
-
       - name: E2E tests
-        run: make test-e2e-short
+        run: go run ./tests/e2e/... --happy-path-only --verbose
+
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000000..d7986bea9a
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,15 @@
+name: Tests
+on: [push, pull_request] 
+jobs:
+  test:
+    strategy:
+      matrix:
+        go-version: [1.19.x, 1.20.x]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/setup-go@v3
+      with:
+        go-version: ${{ matrix.go-version }}
+    - uses: actions/checkout@v3
+    - run: go test ./...