diff --git a/ci-build.yaml b/ci-build.yaml
index 6d5df5f10..9c9aefb7f 100644
--- a/ci-build.yaml
+++ b/ci-build.yaml
@@ -21,10 +21,16 @@ pool:
 
 steps:
 
-- task: CmdLine@2
-  displayName: Run Build Script
+- task: DotNetCoreCLI@2
+  displayName: Run Unit Tests
   inputs:
-    script: './build.sh -Target Build'
+    command: 'test'
+    projects: '$(testProj)'
+- task: Yarn@3
+  displayName: Build UI
+  inputs:
+    projectDirectory: '/src/Ombi/ClientApp/'
+    arguments: 'run build'
 
 - task: PublishTestResults@2
   displayName: Upload Test Results