diff --git a/.github/workflows/aggregate_root.yml b/.github/workflows/aggregate_root_test.yml
similarity index 94%
rename from .github/workflows/aggregate_root.yml
rename to .github/workflows/aggregate_root_test.yml
index 5de37d6b00..73fd05d99b 100644
--- a/.github/workflows/aggregate_root.yml
+++ b/.github/workflows/aggregate_root_test.yml
@@ -1,4 +1,4 @@
-name: aggregate_root
+name: aggregate_root_test
 on:
   repository_dispatch:
     types:
@@ -12,7 +12,7 @@ on:
       - "ruby_event_store-active_record/**"
       - "ruby_event_store-browser/**"
       - "ruby_event_store-rspec/**"
-      - ".github/workflows/aggregate_root.yml"
+      - ".github/workflows/aggregate_root_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -25,7 +25,7 @@ on:
       - "ruby_event_store-active_record/**"
       - "ruby_event_store-browser/**"
       - "ruby_event_store-rspec/**"
-      - ".github/workflows/aggregate_root.yml"
+      - ".github/workflows/aggregate_root_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/dres_client.yml b/.github/workflows/dres_client_test.yml
similarity index 91%
rename from .github/workflows/dres_client.yml
rename to .github/workflows/dres_client_test.yml
index b44ff43299..71191d107d 100644
--- a/.github/workflows/dres_client.yml
+++ b/.github/workflows/dres_client_test.yml
@@ -1,4 +1,4 @@
-name: dres_client
+name: dres_client_test
 on:
   repository_dispatch:
     types:
@@ -10,7 +10,7 @@ on:
     paths:
       - "contrib/dres_client/**"
       - "contrib/dres_rails/**"
-      - ".github/workflows/dres_client.yml"
+      - ".github/workflows/dres_client_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -19,7 +19,7 @@ on:
     paths:
       - "contrib/dres_client/**"
       - "contrib/dres_rails/**"
-      - ".github/workflows/dres_client.yml"
+      - ".github/workflows/dres_client_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/dres_rails.yml b/.github/workflows/dres_rails_test.yml
similarity index 96%
rename from .github/workflows/dres_rails.yml
rename to .github/workflows/dres_rails_test.yml
index cad258a236..a038bff5a9 100644
--- a/.github/workflows/dres_rails.yml
+++ b/.github/workflows/dres_rails_test.yml
@@ -1,4 +1,4 @@
-name: dres_rails
+name: dres_rails_test
 on:
   repository_dispatch:
     types:
@@ -10,7 +10,7 @@ on:
     paths:
       - "contrib/dres_rails/**"
       - "contrib/dres_client/**"
-      - ".github/workflows/dres_rails.yml"
+      - ".github/workflows/dres_rails_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -19,7 +19,7 @@ on:
     paths:
       - "contrib/dres_rails/**"
       - "contrib/dres_client/**"
-      - ".github/workflows/dres_rails.yml"
+      - ".github/workflows/dres_rails_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/minitest-ruby_event_store.yml b/.github/workflows/minitest-ruby_event_store_test.yml
similarity index 92%
rename from .github/workflows/minitest-ruby_event_store.yml
rename to .github/workflows/minitest-ruby_event_store_test.yml
index 7b93381908..de9d5a2bcb 100644
--- a/.github/workflows/minitest-ruby_event_store.yml
+++ b/.github/workflows/minitest-ruby_event_store_test.yml
@@ -1,4 +1,4 @@
-name: minitest-ruby_event_store
+name: minitest-ruby_event_store_test
 on:
   repository_dispatch:
     types:
@@ -7,7 +7,7 @@ on:
   push:
     paths:
       - "contrib/minitest-ruby_event_store/**"
-      - ".github/workflows/minitest-ruby_event_store.yml"
+      - ".github/workflows/minitest-ruby_event_store_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -15,7 +15,7 @@ on:
     types: [opened, reopened]
     paths:
       - "contrib/minitest-ruby_event_store/**"
-      - ".github/workflows/minitest-ruby_event_store.yml"
+      - ".github/workflows/minitest-ruby_event_store_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/rails_event_store.yml b/.github/workflows/rails_event_store_test.yml
similarity index 94%
rename from .github/workflows/rails_event_store.yml
rename to .github/workflows/rails_event_store_test.yml
index 0495710b6b..7615086c58 100644
--- a/.github/workflows/rails_event_store.yml
+++ b/.github/workflows/rails_event_store_test.yml
@@ -1,4 +1,4 @@
-name: rails_event_store
+name: rails_event_store_test
 on:
   repository_dispatch:
     types:
@@ -12,7 +12,7 @@ on:
       - "ruby_event_store-active_record/**"
       - "ruby_event_store-browser/**"
       - "ruby_event_store-rspec/**"
-      - ".github/workflows/rails_event_store.yml"
+      - ".github/workflows/rails_event_store_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -25,7 +25,7 @@ on:
       - "ruby_event_store-active_record/**"
       - "ruby_event_store-browser/**"
       - "ruby_event_store-rspec/**"
-      - ".github/workflows/rails_event_store.yml"
+      - ".github/workflows/rails_event_store_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-active_record.yml b/.github/workflows/ruby_event_store-active_record_test.yml
similarity index 96%
rename from .github/workflows/ruby_event_store-active_record.yml
rename to .github/workflows/ruby_event_store-active_record_test.yml
index 77fbf0c9d4..1951297574 100644
--- a/.github/workflows/ruby_event_store-active_record.yml
+++ b/.github/workflows/ruby_event_store-active_record_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-active_record
+name: ruby_event_store-active_record_test
 on:
   repository_dispatch:
     types:
@@ -12,7 +12,7 @@ on:
       - "ruby_event_store-active_record/**"
       - "ruby_event_store-browser/**"
       - "ruby_event_store-rspec/**"
-      - ".github/workflows/ruby_event_store-active_record.yml"
+      - ".github/workflows/ruby_event_store-active_record_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -25,7 +25,7 @@ on:
       - "ruby_event_store-active_record/**"
       - "ruby_event_store-browser/**"
       - "ruby_event_store-rspec/**"
-      - ".github/workflows/ruby_event_store-active_record.yml"
+      - ".github/workflows/ruby_event_store-active_record_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-browser.yml b/.github/workflows/ruby_event_store-browser_test.yml
similarity index 94%
rename from .github/workflows/ruby_event_store-browser.yml
rename to .github/workflows/ruby_event_store-browser_test.yml
index 0d24fc1ba8..f6bb1a5394 100644
--- a/.github/workflows/ruby_event_store-browser.yml
+++ b/.github/workflows/ruby_event_store-browser_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-browser
+name: ruby_event_store-browser_test
 on:
   repository_dispatch:
     types:
@@ -12,7 +12,7 @@ on:
     - "ruby_event_store-active_record/**"
     - "ruby_event_store-browser/**"
     - "ruby_event_store-rspec/**"
-    - ".github/workflows/ruby_event_store-browser.yml"
+    - ".github/workflows/ruby_event_store-browser_test.yml"
     - "support/**"
     - "!support/bundler/**"
     - "!support/ci/**"
@@ -25,7 +25,7 @@ on:
       - "ruby_event_store-active_record/**"
       - "ruby_event_store-browser/**"
       - "ruby_event_store-rspec/**"
-      - ".github/workflows/ruby_event_store-browser.yml"
+      - ".github/workflows/ruby_event_store-browser_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-flipper.yml b/.github/workflows/ruby_event_store-flipper_test.yml
similarity index 92%
rename from .github/workflows/ruby_event_store-flipper.yml
rename to .github/workflows/ruby_event_store-flipper_test.yml
index aad6afadec..8ac6830e67 100644
--- a/.github/workflows/ruby_event_store-flipper.yml
+++ b/.github/workflows/ruby_event_store-flipper_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-flipper
+name: ruby_event_store-flipper_test
 on:
   repository_dispatch:
     types:
@@ -7,7 +7,7 @@ on:
   push:
     paths:
       - "contrib/ruby_event_store-flipper/**"
-      - ".github/workflows/ruby_event_store-flipper.yml"
+      - ".github/workflows/ruby_event_store-flipper_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -15,7 +15,7 @@ on:
     types: [opened, reopened]
     paths:
       - "contrib/ruby_event_store-flipper/**"
-      - ".github/workflows/ruby_event_store-flipper.yml"
+      - ".github/workflows/ruby_event_store-flipper_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-newrelic.yml b/.github/workflows/ruby_event_store-newrelic_test.yml
similarity index 92%
rename from .github/workflows/ruby_event_store-newrelic.yml
rename to .github/workflows/ruby_event_store-newrelic_test.yml
index 357a0f50b0..5d824c5bb4 100644
--- a/.github/workflows/ruby_event_store-newrelic.yml
+++ b/.github/workflows/ruby_event_store-newrelic_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-newrelic
+name: ruby_event_store-newrelic_test
 on:
   repository_dispatch:
     types:
@@ -7,7 +7,7 @@ on:
   push:
     paths:
       - "contrib/ruby_event_store-newrelic/**"
-      - ".github/workflows/ruby_event_store-newrelic.yml"
+      - ".github/workflows/ruby_event_store-newrelic_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -15,7 +15,7 @@ on:
     types: [opened, reopened]
     paths:
       - "contrib/ruby_event_store-newrelic/**"
-      - ".github/workflows/ruby_event_store-newrelic.yml"
+      - ".github/workflows/ruby_event_store-newrelic_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-outbox.yml b/.github/workflows/ruby_event_store-outbox_test.yml
similarity index 96%
rename from .github/workflows/ruby_event_store-outbox.yml
rename to .github/workflows/ruby_event_store-outbox_test.yml
index 88afe78503..d81ee27d51 100644
--- a/.github/workflows/ruby_event_store-outbox.yml
+++ b/.github/workflows/ruby_event_store-outbox_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-outbox
+name: ruby_event_store-outbox_test
 on:
   repository_dispatch:
     types:
@@ -7,7 +7,7 @@ on:
   push:
     paths:
       - "contrib/ruby_event_store-outbox/**"
-      - ".github/workflows/ruby_event_store-outbox.yml"
+      - ".github/workflows/ruby_event_store-outbox_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -15,7 +15,7 @@ on:
     types: [opened, reopened]
     paths:
       - "contrib/ruby_event_store-outbox/**"
-      - ".github/workflows/ruby_event_store-outbox.yml"
+      - ".github/workflows/ruby_event_store-outbox_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-profiler.yml b/.github/workflows/ruby_event_store-profiler_test.yml
similarity index 92%
rename from .github/workflows/ruby_event_store-profiler.yml
rename to .github/workflows/ruby_event_store-profiler_test.yml
index 7b7d0de4ce..bd00635fda 100644
--- a/.github/workflows/ruby_event_store-profiler.yml
+++ b/.github/workflows/ruby_event_store-profiler_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-profiler
+name: ruby_event_store-profiler_test
 on:
   repository_dispatch:
     types:
@@ -7,7 +7,7 @@ on:
   push:
     paths:
       - "contrib/ruby_event_store-profiler/**"
-      - ".github/workflows/ruby_event_store-profiler.yml"
+      - ".github/workflows/ruby_event_store-profiler_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -15,7 +15,7 @@ on:
     types: [opened, reopened]
     paths:
       - "contrib/ruby_event_store-profiler/**"
-      - ".github/workflows/ruby_event_store-profiler.yml"
+      - ".github/workflows/ruby_event_store-profiler_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-protobuf.yml b/.github/workflows/ruby_event_store-protobuf_test.yml
similarity index 93%
rename from .github/workflows/ruby_event_store-protobuf.yml
rename to .github/workflows/ruby_event_store-protobuf_test.yml
index 8b435fd232..3fe9aad835 100644
--- a/.github/workflows/ruby_event_store-protobuf.yml
+++ b/.github/workflows/ruby_event_store-protobuf_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-protobuf
+name: ruby_event_store-protobuf_test
 on:
   repository_dispatch:
     types:
@@ -7,7 +7,7 @@ on:
   push:
     paths:
       - "contrib/ruby_event_store-protobuf/**"
-      - ".github/workflows/ruby_event_store-protobuf.yml"
+      - ".github/workflows/ruby_event_store-protobuf_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -15,7 +15,7 @@ on:
     types: [opened, reopened]
     paths:
       - "contrib/ruby_event_store-protobuf/**"
-      - ".github/workflows/ruby_event_store-protobuf.yml"
+      - ".github/workflows/ruby_event_store-protobuf_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-rom.yml b/.github/workflows/ruby_event_store-rom_test.yml
similarity index 96%
rename from .github/workflows/ruby_event_store-rom.yml
rename to .github/workflows/ruby_event_store-rom_test.yml
index a9e95a0388..3f87939ef3 100644
--- a/.github/workflows/ruby_event_store-rom.yml
+++ b/.github/workflows/ruby_event_store-rom_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-rom
+name: ruby_event_store-rom_test
 on:
   repository_dispatch:
     types:
@@ -7,7 +7,7 @@ on:
   push:
     paths:
       - "contrib/ruby_event_store-rom/**"
-      - ".github/workflows/ruby_event_store-rom.yml"
+      - ".github/workflows/ruby_event_store-rom_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -15,7 +15,7 @@ on:
     types: [opened, reopened]
     paths:
       - "contrib/ruby_event_store-rom/**"
-      - ".github/workflows/ruby_event_store-rom.yml"
+      - ".github/workflows/ruby_event_store-rom_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-rspec.yml b/.github/workflows/ruby_event_store-rspec_test.yml
similarity index 93%
rename from .github/workflows/ruby_event_store-rspec.yml
rename to .github/workflows/ruby_event_store-rspec_test.yml
index 89c660aff9..a699fc0589 100644
--- a/.github/workflows/ruby_event_store-rspec.yml
+++ b/.github/workflows/ruby_event_store-rspec_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-rspec
+name: ruby_event_store-rspec_test
 on:
   repository_dispatch:
     types:
@@ -12,7 +12,7 @@ on:
       - "ruby_event_store-active_record/**"
       - "ruby_event_store-browser/**"
       - "ruby_event_store-rspec/**"
-      - ".github/workflows/ruby_event_store-rspec.yml"
+      - ".github/workflows/ruby_event_store-rspec_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -25,7 +25,7 @@ on:
       - "ruby_event_store-active_record/**"
       - "ruby_event_store-browser/**"
       - "ruby_event_store-rspec/**"
-      - ".github/workflows/ruby_event_store-rspec.yml"
+      - ".github/workflows/ruby_event_store-rspec_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-sequel.yml b/.github/workflows/ruby_event_store-sequel_test.yml
similarity index 96%
rename from .github/workflows/ruby_event_store-sequel.yml
rename to .github/workflows/ruby_event_store-sequel_test.yml
index 43d94427b4..13cb6ebf4c 100644
--- a/.github/workflows/ruby_event_store-sequel.yml
+++ b/.github/workflows/ruby_event_store-sequel_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-sequel
+name: ruby_event_store-sequel_test
 on:
   repository_dispatch:
     types:
@@ -7,7 +7,7 @@ on:
   push:
     paths:
       - "contrib/ruby_event_store-sequel/**"
-      - ".github/workflows/ruby_event_store-sequel.yml"
+      - ".github/workflows/ruby_event_store-sequel_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -15,7 +15,7 @@ on:
     types: [opened, reopened]
     paths:
       - "contrib/ruby_event_store-sequel/**"
-      - ".github/workflows/ruby_event_store-sequel.yml"
+      - ".github/workflows/ruby_event_store-sequel_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-sidekiq_scheduler.yml b/.github/workflows/ruby_event_store-sidekiq_scheduler_test.yml
similarity index 94%
rename from .github/workflows/ruby_event_store-sidekiq_scheduler.yml
rename to .github/workflows/ruby_event_store-sidekiq_scheduler_test.yml
index 3343593bfc..0a6f2b8a36 100644
--- a/.github/workflows/ruby_event_store-sidekiq_scheduler.yml
+++ b/.github/workflows/ruby_event_store-sidekiq_scheduler_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-sidekiq_scheduler
+name: ruby_event_store-sidekiq_scheduler_test
 on:
   repository_dispatch:
     types:
@@ -7,7 +7,7 @@ on:
   push:
     paths:
       - "contrib/ruby_event_store-sidekiq_scheduler/**"
-      - ".github/workflows/ruby_event_store-sidekiq_scheduler.yml"
+      - ".github/workflows/ruby_event_store-sidekiq_scheduler_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -15,7 +15,7 @@ on:
     types: [opened, reopened]
     paths:
       - "contrib/ruby_event_store-sidekiq_scheduler/**"
-      - ".github/workflows/ruby_event_store-sidekiq_scheduler.yml"
+      - ".github/workflows/ruby_event_store-sidekiq_scheduler_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store-transformations.yml b/.github/workflows/ruby_event_store-transformations_test.yml
similarity index 91%
rename from .github/workflows/ruby_event_store-transformations.yml
rename to .github/workflows/ruby_event_store-transformations_test.yml
index 56a32feea5..b8ff956f8d 100644
--- a/.github/workflows/ruby_event_store-transformations.yml
+++ b/.github/workflows/ruby_event_store-transformations_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store-transformations
+name: ruby_event_store-transformations_test
 on:
   repository_dispatch:
     types:
@@ -7,7 +7,7 @@ on:
   push:
     paths:
       - "contrib/ruby_event_store-transformations/**"
-      - ".github/workflows/ruby_event_store-transformations.yml"
+      - ".github/workflows/ruby_event_store-transformations_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -15,7 +15,7 @@ on:
     types: [opened, reopened]
     paths:
       - "contrib/ruby_event_store-transformations/**"
-      - ".github/workflows/ruby_event_store-transformations.yml"
+      - ".github/workflows/ruby_event_store-transformations_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/.github/workflows/ruby_event_store.yml b/.github/workflows/ruby_event_store_test.yml
similarity index 94%
rename from .github/workflows/ruby_event_store.yml
rename to .github/workflows/ruby_event_store_test.yml
index 1d3051a554..b33853f8b7 100644
--- a/.github/workflows/ruby_event_store.yml
+++ b/.github/workflows/ruby_event_store_test.yml
@@ -1,4 +1,4 @@
-name: ruby_event_store
+name: ruby_event_store_test
 on:
   repository_dispatch:
     types:
@@ -12,7 +12,7 @@ on:
       - "ruby_event_store-active_record/**"
       - "ruby_event_store-browser/**"
       - "ruby_event_store-rspec/**"
-      - ".github/workflows/ruby_event_store.yml"
+      - ".github/workflows/ruby_event_store_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
@@ -25,7 +25,7 @@ on:
       - "ruby_event_store-active_record/**"
       - "ruby_event_store-browser/**"
       - "ruby_event_store-rspec/**"
-      - ".github/workflows/ruby_event_store.yml"
+      - ".github/workflows/ruby_event_store_test.yml"
       - "support/**"
       - "!support/bundler/**"
       - "!support/ci/**"
diff --git a/support/ci/generate b/support/ci/generate
index 1cb2d5ad05..beb8363943 100755
--- a/support/ci/generate
+++ b/support/ci/generate
@@ -70,7 +70,7 @@ class CI
     template: "ruby.yaml.erb"
   )
     {
-      name: name,
+      name: "#{name}_test",
       working_directory: working_directory || name,
       matrix: matrix,
       template: template