diff --git a/.github/workflows/gem-install.yml b/.github/workflows/ci.yml
similarity index 87%
rename from .github/workflows/gem-install.yml
rename to .github/workflows/ci.yml
index 561f22d..68948dd 100644
--- a/.github/workflows/gem-install.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: packaging
+name: ci
 concurrency:
   group: "${{github.workflow}}-${{github.ref}}"
   cancel-in-progress: true
@@ -7,7 +7,7 @@ on:
   push:
     branches:
       - main
-      - v4.x
+      - v4*
     tags:
       - v*.*.*
   pull_request:
@@ -16,7 +16,25 @@ on:
       - '*'
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["3.0", "3.1", "3.2", "3.3", "3.4", "head"]
+    steps:
+      - uses: actions/checkout@v4
+      - run: rm Gemfile.lock
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby}}
+          bundler: latest
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake test
+
   package:
+    needs: [ "test" ]
     name: "package (${{ matrix.platform }})"
     strategy:
       fail-fast: false
@@ -47,9 +65,9 @@ jobs:
           path: pkg
           retention-days: 1
 
-  vanilla-install:
+  install-ruby:
     name: "install (ruby)"
-    needs: ["package"]
+    needs: [ "package" ]
     runs-on: ubuntu-latest
     steps:
       - uses: ruby/setup-ruby@v1
@@ -62,7 +80,7 @@ jobs:
       - run: "gem install pkg/tailwindcss-ruby-*.gem"
       - run: "tailwindcss 2>&1 | fgrep 'ERROR: Cannot find the tailwindcss executable'"
 
-  install-matrix:
+  install-native:
     name: "install (${{ matrix.platform }})"
     needs: [ "package" ]
     strategy:
diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index 853598e..474c838 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -27,15 +27,15 @@ jobs:
           - url: https://github.com/rails/tailwindcss-rails
             name: rails-unit
             command: "bin/test"
-            ruby: "3.3"
+            ruby: "3.4"
           - url: https://github.com/rails/tailwindcss-rails
             name: rails-install
             command: "env TAILWINDCSSOPTS=--path=../../.. test/integration/user_install_test.sh"
-            ruby: "3.3"
+            ruby: "3.4"
           - url: https://github.com/rails/tailwindcss-rails
             name: rails-upgrade
             command: "env TAILWINDCSSOPTS=--path=../../.. test/integration/user_upgrade_test.sh"
-            ruby: "3.3"
+            ruby: "3.4"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 943726e..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: ci
-concurrency:
-  group: "${{github.workflow}}-${{github.ref}}"
-  cancel-in-progress: true
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-      - v4*
-    tags:
-      - v*.*.*
-  pull_request:
-    types: [opened, synchronize]
-    branches:
-      - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ["3.0", "3.1", "3.2", "3.3", "head"]
-    steps:
-      - uses: actions/checkout@v4
-      - run: rm Gemfile.lock
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{matrix.ruby}}
-          bundler: latest
-          bundler-cache: true
-      - name: Run tests
-        run: bundle exec rake test