diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml
index 0c6a7f3c..e4661f11 100644
--- a/.github/workflows/client-ci.yml
+++ b/.github/workflows/client-ci.yml
@@ -30,6 +30,3 @@ jobs:
         run: npm run lint
         working-directory: client
 
-      - name: Run tests (Frontend)
-        run: npm test
-        working-directory: client
diff --git a/.github/workflows/clinic-microservice-ci.yml b/.github/workflows/clinic-microservice-ci.yml
new file mode 100644
index 00000000..cc65814d
--- /dev/null
+++ b/.github/workflows/clinic-microservice-ci.yml
@@ -0,0 +1,31 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: Clinic CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  lint-and-test-patient:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+
+      - name: Install dependencies (Patient Microservice)
+        run: npm ci
+        working-directory: clinic
+
+      - name: Run ESLint (Patient Microservice)
+        run: npm run lint
+        working-directory: clinic
diff --git a/.github/workflows/patient-microservice-ci.yml b/.github/workflows/patient-microservice-ci.yml
new file mode 100644
index 00000000..4fdd070f
--- /dev/null
+++ b/.github/workflows/patient-microservice-ci.yml
@@ -0,0 +1,31 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: Patient CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  lint-and-test-patient:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+
+      - name: Install dependencies (Patient Microservice)
+        run: npm ci
+        working-directory: patient
+
+      - name: Run ESLint (Patient Microservice)
+        run: npm run lint
+        working-directory: patient