diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f94e44139..76ee2a3bc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -23,6 +23,6 @@ jobs:
           poetry config virtualenvs.create false
           make install-dev
       - name: Lint        
-        run: make lint 
+        run: make lint-services
       - name: Test
-        run: make test
+        run: make test-services
diff --git a/Makefile b/Makefile
index 782ada543..34c00d989 100644
--- a/Makefile
+++ b/Makefile
@@ -12,13 +12,13 @@ install-dev:
 	# install core. This needs to be done last or it will get overriden by the dependency installation of the services
 	poetry install -C core --no-root; pip install -e core
 
-test:
+test-services:
 	# test core
 	cd core && poetry install --with dev && pytest
 	# test services
 	@for f in $(shell ls ${SERVICES_DIR}); do  set -e; cd ${SERVICES_DIR}/$${f}; poetry install --with dev;sh -c 'pytest || ([ $$? = 5 ] && exit 0 || exit $$?)'; cd ../..; done
 
-lint:	
+lint-services:
 	# lint core
 	cd core && poetry install --no-root --only dev &&flake8 . 
 	# lint examples. Use configuration from core
@@ -26,6 +26,14 @@ lint:
 	# lint services
 	@for f in $(shell ls ${SERVICES_DIR}); do set -e; cd ${SERVICES_DIR}/$${f};poetry install --no-root --only dev; flake8 .; cd ../..; done
 
+test:
+	echo "Testing service ${service}"
+	cd ${SERVICES_DIR}/${service}; poetry install --with dev;sh -c 'pytest || ([ $$? = 5 ] && exit 0 || exit $$?)'; cd ../..;
+
+lint:
+	echo "Linting service ${service}"
+	cd ${SERVICES_DIR}/${service};poetry install --no-root --only dev; flake8 .; cd ../..;
+
 update-dependencies:
 	# lock core
 	cd core && poetry lock