diff --git a/.github/workflows/nocobase-test.yml b/.github/workflows/nocobase-test.yml
index ab3c1b1a7..c5fb8f294 100644
--- a/.github/workflows/nocobase-test.yml
+++ b/.github/workflows/nocobase-test.yml
@@ -20,6 +20,7 @@ jobs:
     strategy:
       matrix:
         node_version: ['16', '18']
+        underscored: [true, false]
     runs-on: ubuntu-latest
     container: node:${{ matrix.node_version }}
     steps:
@@ -36,12 +37,14 @@ jobs:
         env:
           DB_DIALECT: sqlite
           DB_STORAGE: /tmp/db.sqlite
+          DB_UNDERSCORED: ${{ matrix.underscored }}
 
   postgres-test:
     strategy:
       matrix:
         node_version: ['16', '18']
-
+        underscored: [true, false]
+        schema: [public, nocobase]
     runs-on: ubuntu-latest
     container: node:${{ matrix.node_version }}
     services:
@@ -77,11 +80,14 @@ jobs:
           DB_USER: nocobase
           DB_PASSWORD: password
           DB_DATABASE: nocobase
+          DB_UNDERSCORED: ${{ matrix.underscored }}
+          DB_SCHEMA: ${{ matrix.schema }}
 
   mysql-test:
     strategy:
       matrix:
         node_version: ['16', '18']
+        underscored: [true, false]
     runs-on: ubuntu-latest
     container: node:${{ matrix.node_version }}
     services:
@@ -109,97 +115,4 @@ jobs:
           DB_USER: root
           DB_PASSWORD: password
           DB_DATABASE: nocobase
-
-  sqlite-underscored-test:
-    strategy:
-      matrix:
-        node_version: ['16']
-    runs-on: ubuntu-latest
-    container: node:${{ matrix.node_version }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node_version }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node_version }}
-          cache: 'yarn'
-      - run: yarn install
-      - name: Test with Sqlite
-        run: yarn test
-        env:
-          DB_DIALECT: sqlite
-          DB_STORAGE: /tmp/db.sqlite
-          DB_UNDERSCORED: true
-
-  postgres-underscored-test:
-    strategy:
-      matrix:
-        node_version: ['16']
-
-    runs-on: ubuntu-latest
-    container: node:${{ matrix.node_version }}
-    services:
-      # Label used to access the service container
-      postgres:
-        # Docker Hub image
-        image: postgres:10
-        # Provide the password for postgres
-        env:
-          POSTGRES_USER: nocobase
-          POSTGRES_PASSWORD: password
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node_version }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node_version }}
-          cache: 'yarn'
-      - run: yarn install
-      - name: Test with postgres
-        run: yarn test
-        env:
-          DB_DIALECT: postgres
-          DB_HOST: postgres
-          DB_PORT: 5432
-          DB_USER: nocobase
-          DB_PASSWORD: password
-          DB_DATABASE: nocobase
-          DB_UNDERSCORED: true
-
-  mysql-underscored-test:
-    strategy:
-      matrix:
-        node_version: ['16']
-    runs-on: ubuntu-latest
-    container: node:${{ matrix.node_version }}
-    services:
-      mysql:
-        image: mysql:8
-        env:
-          MYSQL_ROOT_PASSWORD: password
-          MYSQL_DATABASE: nocobase
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node_version }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node_version }}
-          cache: 'yarn'
-      - run: yarn install
-      - name: Test with MySQL
-        run: yarn test
-        env:
-          DB_DIALECT: mysql
-          DB_HOST: mysql
-          DB_PORT: 3306
-          DB_USER: root
-          DB_PASSWORD: password
-          DB_DATABASE: nocobase
-          DB_UNDERSCORED: true
+          DB_UNDERSCORED: ${{ matrix.underscored }}