diff --git a/.github/workflows/manual-e2e.yml b/.github/workflows/manual-e2e.yml
index 3893d009df..9d7259dae4 100644
--- a/.github/workflows/manual-e2e.yml
+++ b/.github/workflows/manual-e2e.yml
@@ -20,7 +20,7 @@ jobs:
         with:
           go-version: "1.20" # The Go version to download (if necessary) and use.
       - name: E2E happy-path test
-        run: go run ./tests/e2e/... --tc happy-path
+        run: go run ./tests/e2e/... --tc happy-path/default
   changeover-test:
     runs-on: ubuntu-latest
     timeout-minutes: 20
@@ -36,7 +36,7 @@ jobs:
         with:
           go-version: "1.20" # The Go version to download (if necessary) and use.
       - name: E2E changeover test
-        run: go run ./tests/e2e/... --tc changeover
+        run: go run ./tests/e2e/... --tc changeover/changeover
   democracy-reward-test:
       runs-on: ubuntu-latest
       timeout-minutes: 20
@@ -68,7 +68,7 @@ jobs:
           with:
             go-version: "1.20" # The Go version to download (if necessary) and use.
         - name: E2E democracy tests
-          run: go run ./tests/e2e/... --tc democracy
+          run: go run ./tests/e2e/... --tc democracy/democracy
   slash-throttle-test:
       runs-on: ubuntu-latest
       timeout-minutes: 20
@@ -84,7 +84,7 @@ jobs:
           with:
             go-version: "1.20" # The Go version to download (if necessary) and use.
         - name: E2E slash-throttle tests
-          run: go run ./tests/e2e/... --tc slash-throttle
+          run: go run ./tests/e2e/... --tc slash-throttle/slash-throttle
   multiconsumer-test:
       runs-on: ubuntu-latest
       timeout-minutes: 40
@@ -100,4 +100,4 @@ jobs:
           with:
             go-version: "1.20" # The Go version to download (if necessary) and use.
         - name: E2E multi-consumer tests
-          run: go run ./tests/e2e/... --tc multiconsumer
+          run: go run ./tests/e2e/... --tc multiconsumer/multiconsumer
diff --git a/.github/workflows/nightly-e2e.yml b/.github/workflows/nightly-e2e.yml
index 913f7e0bbe..2aabfb4b1a 100644
--- a/.github/workflows/nightly-e2e.yml
+++ b/.github/workflows/nightly-e2e.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           go-version: "1.20" # The Go version to download (if necessary) and use.
       - name: E2E happy-path test
-        run: go run ./tests/e2e/... --tc happy-path
+        run: go run ./tests/e2e/... --tc happy-path/default
   changeover-test:
     runs-on: ubuntu-latest
     timeout-minutes: 20
@@ -49,7 +49,7 @@ jobs:
         with:
           go-version: "1.20" # The Go version to download (if necessary) and use.
       - name: E2E changeover test
-        run: go run ./tests/e2e/... --tc changeover
+        run: go run ./tests/e2e/... --tc changeover/changeover
   democracy-reward-test:
     runs-on: ubuntu-latest
     timeout-minutes: 20
@@ -65,7 +65,7 @@ jobs:
         with:
           go-version: "1.20" # The Go version to download (if necessary) and use.
       - name: E2E democracy-reward tests
-        run: go run ./tests/e2e/... --tc democracy-reward
+        run: go run ./tests/e2e/... --tc democracy-reward/democracy-reward
   democracy-test:
     runs-on: ubuntu-latest
     timeout-minutes: 20
@@ -81,7 +81,7 @@ jobs:
         with:
           go-version: "1.20" # The Go version to download (if necessary) and use.
       - name: E2E democracy tests
-        run: go run ./tests/e2e/... --tc democracy
+        run: go run ./tests/e2e/... --tc democracy/democracy
   slash-throttle-test:
     runs-on: ubuntu-latest
     timeout-minutes: 20
@@ -97,7 +97,7 @@ jobs:
         with:
           go-version: "1.20" # The Go version to download (if necessary) and use.
       - name: E2E slash-throttle tests
-        run: go run ./tests/e2e/... --tc slash-throttle
+        run: go run ./tests/e2e/... --tc slash-throttle/slash-throttle
   multiconsumer-test:
     runs-on: ubuntu-latest
     timeout-minutes: 40
@@ -113,7 +113,7 @@ jobs:
         with:
           go-version: "1.20" # The Go version to download (if necessary) and use.
       - name: E2E multi-consumer tests
-        run: go run ./tests/e2e/... --tc multiconsumer
+        run: go run ./tests/e2e/... --tc multiconsumer/multiconsumer
 
   nightly-test-fail:
     needs:
diff --git a/Makefile b/Makefile
index ac7c38f068..313fe30c96 100644
--- a/Makefile
+++ b/Makefile
@@ -31,12 +31,12 @@ test-diff:
 
 # run only happy path E2E tests
 test-e2e-short:
-	go run ./tests/e2e/... --tc happy-path
+	go run ./tests/e2e/... --tc happy-path/default
 
 # run only happy path E2E tests with cometmock
 # this set of traces does not test equivocation but it does check downtime
 test-e2e-short-cometmock:
-	go run ./tests/e2e/... --tc happy-path-short --use-cometmock --use-gorelayer
+	go run ./tests/e2e/... --tc happy-path-short/default --use-cometmock --use-gorelayer
 
 # run full E2E tests in sequence (including multiconsumer)
 test-e2e-multi-consumer:
@@ -52,7 +52,7 @@ test-gaia-e2e:
 
 # run only happy path E2E tests using latest tagged gaia
 test-gaia-e2e-short:
-	go run ./tests/e2e/... --tc happy-path --use-gaia
+	go run ./tests/e2e/... --tc happy-path/default --use-gaia
 
 # run full E2E tests in parallel (including multiconsumer) using latest tagged gaia
 test-gaia-e2e-parallel:
@@ -66,7 +66,7 @@ test-gaia-e2e-tagged:
 # run only happy path E2E tests using latest tagged gaia
 # usage: GAIA_TAG=v9.0.0 make test-gaia-e2e-short-tagged
 test-gaia-e2e-short-tagged:
-	go run ./tests/e2e/... --tc happy-path --use-gaia --gaia-tag $(GAIA_TAG)
+	go run ./tests/e2e/... --tc happy-path/default --use-gaia --gaia-tag $(GAIA_TAG)
 
 # run full E2E tests in parallel (including multiconsumer) using specific tagged version of gaia
 # usage: GAIA_TAG=v9.0.0 make test-gaia-e2e-parallel-tagged
diff --git a/tests/e2e/main.go b/tests/e2e/main.go
index b2b157b058..3e2c0b534b 100644
--- a/tests/e2e/main.go
+++ b/tests/e2e/main.go
@@ -189,7 +189,7 @@ func getTestCases(selection TestSet) (tests []testRunWithSteps) {
 			"democracy-reward/democracy-reward", "democracy/democracy", "slash-throttle/slash-throttle",
 		}
 		if includeMultiConsumer != nil && *includeMultiConsumer {
-			selection = append(selection, "multiconsumer")
+			selection = append(selection, "multiconsumer/multiconsumer")
 		}
 	}