diff --git a/.github/workflows/jest.yml b/.github/workflows/jest.yml
deleted file mode 100644
index 22667a56..00000000
--- a/.github/workflows/jest.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Jest specs
-
-on:
-  push:
-    branches:
-      - 'main'
-      - 'next'
-  pull_request:
-
-concurrency:
-  # Pushing new changes to a branch will cancel any in-progress CI runs
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  jest:
-    name: Jest specs
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        node: [14.x, 16.x, 18.x]
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node }}
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn --frozen-lockfile --non-interactive --prefer-offline
-
-      - name: Jest Specs
-        run: yarn test
diff --git a/.github/workflows/js-lint.yml b/.github/workflows/node.yml
similarity index 56%
rename from .github/workflows/js-lint.yml
rename to .github/workflows/node.yml
index d197b8ba..a3a86690 100644
--- a/.github/workflows/js-lint.yml
+++ b/.github/workflows/node.yml
@@ -1,4 +1,4 @@
-name: JS lint
+name: Node based checks
 
 on:
   push:
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   lint:
-    name: JS Lint
+    name: Linting
     strategy:
       matrix:
         os: [ubuntu-latest]
@@ -37,3 +37,27 @@ jobs:
 
       - name: Lint
         run: yarn lint
+  test:
+    name: Testing
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node: [14.x, 16.x, 18.x]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn --frozen-lockfile --non-interactive --prefer-offline
+
+      - name: Jest Specs
+        run: yarn test
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
deleted file mode 100644
index 419ce2bc..00000000
--- a/.github/workflows/rubocop.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Rubocop
-
-on:
-  push:
-    branches:
-      - 'main'
-      - 'next'
-  pull_request:
-
-concurrency:
-  # Pushing new changes to a branch will cancel any in-progress CI runs
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  rubocop:
-    name: Rubocop
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        ruby: ['2.7', '3.0']
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - name: Ruby rubocop
-        run: bundle exec rubocop
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index b50dbf90..2c4a7419 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -1,4 +1,4 @@
-name: Ruby specs
+name: Ruby based checks
 
 on:
   push:
@@ -13,8 +13,28 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  lint:
+    name: Linting
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        ruby: ['2.7', '3.0']
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Ruby rubocop
+        run: bundle exec rubocop
+
   test:
-    name: Ruby specs
+    name: Testing
     runs-on: ${{ matrix.os }}
     strategy:
       matrix: