diff --git a/.github/scripts/build_test.sh b/.github/scripts/build_test.sh
deleted file mode 100755
index 4e9287fb1..000000000
--- a/.github/scripts/build_test.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-python3 "${ROOT_DIRECTORY}"/bazarr.py &
-PID=$!
-
-sleep 30
-
-if kill -s 0 $PID
-then
-  echo "Bazarr is still running. We'll kill it..."
-  kill $PID
-  exit 0
-else
-  exit 1
-fi
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3fd5bad54..8873973ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,21 +5,26 @@ on:
     branches: [development]
     paths:
       - frontend/**
+      - bazarr/**
+      - libs/**
+      - bazarr.py
+      - requirements.txt
+      - dev-requirements.txt
       - .github/workflows/ci.yml
   pull_request:
     branches: [development]
 
+env:
+    UI_DIRECTORY: ./frontend
 
 jobs:
   Frontend:
     runs-on: ubuntu-latest
-    env:
-      ROOT_DIRECTORY: .
-      UI_DIRECTORY: ./frontend
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
 
       - name: Cache node_modules
         uses: actions/cache@v2
@@ -46,16 +51,41 @@ jobs:
           name: "ui"
           path: "${{ env.UI_DIRECTORY }}/build"
 
+  Backend:
+    runs-on: ubuntu-latest
+    needs: Frontend
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+
       - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:
           python-version: '3.8'
 
+      - name: Install UI
+        uses: actions/download-artifact@v2
+        with:
+          name: "ui"
+          path: "${{ env.UI_DIRECTORY }}/build"
+
       - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r '${{ env.ROOT_DIRECTORY }}/requirements.txt'
+        run: pip install -r requirements.txt
 
-      - name: Test Bazarr execution
+      - name: Unit Tests
         run: |
-          bash '.github/scripts/build_test.sh'
+          python3 bazarr.py &
+          PID=$!
+          sleep 15
+          if kill -s 0 $PID
+          then
+            echo "**** Bazarr launch successful ****"
+            kill $PID
+            exit 0
+          else
+          echo "**** Bazarr launch failed ****"
+            exit 1
+          fi
diff --git a/.github/workflows/test_bazarr_execution.yml b/.github/workflows/test_bazarr_execution.yml
deleted file mode 100644
index fa0243520..000000000
--- a/.github/workflows/test_bazarr_execution.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: test_bazarr_execution
-on: workflow_dispatch
-
-jobs:
-  Test:
-    runs-on: ubuntu-latest
-    env:
-      ROOT_DIRECTORY: .
-      SCRIPTS_DIRECTORY: .github/scripts
-      UI_DIRECTORY: ./frontend
-      FETCH_DEPTH: 15 # Should be enough
-    steps:
-      - name: Validate branch
-        if: ${{ github.ref != 'refs/heads/development' }}
-        run: |
-          echo This action can only be run on development branch, not ${{ github.ref }}
-          exit 1
-
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: ${{ env.FETCH_DEPTH }}
-          ref: development
-
-      - name: Setup NodeJS
-        uses: actions/setup-node@v2
-        with:
-          node-version: "15.x"
-
-      - name: Install UI Dependencies
-        run: npm install
-        working-directory: ${{ env.UI_DIRECTORY }}
-
-      - name: Build UI
-        run: npm run build
-        working-directory: ${{ env.UI_DIRECTORY }}
-
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.8'
-
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r '${{ env.ROOT_DIRECTORY }}/requirements.txt'
-
-      - name: Test Bazarr execution
-        run: |
-          bash '${{ env.SCRIPTS_DIRECTORY }}/build_test.sh'