diff --git a/.gitlab/client.gitlab-ci.yml b/.gitlab/client.gitlab-ci.yml
index f73fe0009fd41aad2f5aafacf62160657aa26bc9..5313078ae5fa9b28b44f9a19ebf765762c2d8cd3 100644
--- a/.gitlab/client.gitlab-ci.yml
+++ b/.gitlab/client.gitlab-ci.yml
@@ -1,6 +1,12 @@
 client:setup:
   image: node:10
   stage: setup
+  only:
+    refs:
+      - dev
+      - merge_requests
+    changes:
+      - client/**/*
   script:
     - cd client
     - npm install
@@ -21,6 +27,12 @@ client:linting:
   image: node:10
   stage: test
   needs: ["client:setup"]
+  only:
+    refs:
+      - dev
+      - merge_requests
+    changes:
+      - client/**/*
   script:
     - cd client
     - npm run lint
@@ -29,8 +41,13 @@ client:test:
   image: node:10
   stage: test
   needs: ["client:setup"]
+  only:
+    refs:
+      - dev
+      - merge_requests
+    changes:
+      - client/**/*
   script:
     - cd client
     - npm run test:coverage
-
   coverage: /All files\s*\|\s*([\d\.]+)/
diff --git a/.gitlab/server.gitlab-ci.yml b/.gitlab/server.gitlab-ci.yml
index e2913efbe4a840ec373a0bac452e2785141a900b..5139e39813debc0536872cb6e044e0d2a28838f4 100644
--- a/.gitlab/server.gitlab-ci.yml
+++ b/.gitlab/server.gitlab-ci.yml
@@ -1,6 +1,12 @@
 server:setup:
   image: python
   stage: setup
+  only:
+    refs:
+      - dev
+      - merge_requests
+    changes:
+      - server/**/*
   artifacts:
     paths:
       - server/env
@@ -22,6 +28,12 @@ server:test:
   image: python
   stage: test
   needs: ["server:setup"]
+  only:
+    refs:
+      - dev
+      - merge_requests
+    changes:
+      - server/**/*
   script:
     - cd server
     - source env/bin/activate
diff --git a/README.md b/README.md
index 14f8c3056856326f19f2263714d8b0e441012359..66ebcfb30963378191d2d4aaea096f5af3efa910 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-![coverage report](https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system/badges/dev/coverage.svg?job=test:unit&key_text=Client+Coverage&key_width=110)
-![coverage report](https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system/badges/dev/coverage.svg?job=test-server&key_text=Server+Coverage&key_width=115)
+![coverage report](https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system/badges/dev/coverage.svg?job=client:test&key_text=Client+Coverage&key_width=110)
+![coverage report](https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system/badges/dev/coverage.svg?job=server:test&key_text=Server+Coverage&key_width=115)
 
 
 # Scoring system for Teknikåttan