diff --git a/.buildkite/eslint_flow_jest.yml b/.buildkite/eslint_flow_jest.yml
index c2bd5f7db..da4e38579 100644
--- a/.buildkite/eslint_flow_jest.yml
+++ b/.buildkite/eslint_flow_jest.yml
@@ -1,9 +1,10 @@
 steps:
   - command:
       - '(pkill flow || true)'
       - 'yarn cleaninstall --frozen-lockfile --skip-optional'
       - 'yarn eslint --max-warnings=0 & yarn workspace lib flow & yarn workspace web flow & yarn workspace landing flow & yarn workspace native flow'
       - 'cd keyserver && mkdir secrets && touch secrets/db_config.json && touch secrets/olm_config.json && mkdir facts && touch facts/app_url.json && touch facts/commapp_url.json && touch facts/squadcal_url.json && touch facts/landing_url.json && touch facts/url.json && cd ../ && yarn workspace keyserver flow'
       - 'cd lib && yarn test'
+      - 'cd ../keyserver && yarn test'
     agents:
       - 'linux=true'
diff --git a/.github/workflows/eslint_flow_jest.yml b/.github/workflows/eslint_flow_jest.yml
index ed0fa90ae..7954a0f4f 100644
--- a/.github/workflows/eslint_flow_jest.yml
+++ b/.github/workflows/eslint_flow_jest.yml
@@ -1,53 +1,57 @@
 name: ESLint & Flow & Jest
 
 on:
   push:
     branches: [master]
 
 jobs:
   build:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
 
       - name: npm install -g yarn
         run: npm install -g yarn
 
       - name: yarn --frozen-lockfile
         run: yarn --frozen-lockfile
 
       - name: yarn eslint --max-warnings=0
         run: yarn eslint --max-warnings=0
 
       - name: '[lib] flow'
         working-directory: ./lib
         run: ./node_modules/.bin/flow
 
       - name: '[keyserver] flow'
         working-directory: ./keyserver
         run: |
           mkdir secrets
           touch secrets/db_config.json
           touch secrets/olm_config.json
           mkdir facts
           touch facts/squadcal_url.json
           touch facts/commapp_url.json
           touch facts/landing_url.json
           touch facts/url.json
           ./node_modules/.bin/flow
 
       - name: '[web] flow'
         working-directory: ./web
         run: ./node_modules/.bin/flow
 
       - name: '[landing] flow'
         working-directory: ./landing
         run: ./node_modules/.bin/flow
 
       - name: '[native] flow'
         working-directory: ./native
         run: ./node_modules/.bin/flow
 
       - name: '[lib] test'
         working-directory: ./lib
         run: yarn test
+
+      - name: '[keyserver] test'
+        working-directory: ./keyserver
+        run: yarn test