diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 723894f451074e7a50384ffef420fbea79892d62..a0cbe2de294651c6cde9bd222cd8837c21ce0603 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,10 @@
 image: centos:7
 
 before_script:
+ - echo "Installing dependencies (this should go in a custom Docker image for CI to avoid reinstalling dependencies for each stage)..."
  - yum -y groupinstall 'Development Tools'
- - yum -y install cmake epel-release python3 python3-devel python3-pip
+ - yum -y install cmake epel-release python3 python3-devel python3-pip log4cplus-devel postgresql-devel openldap-devel readline-devel qpid-cpp-server qpid-cpp-client-devel qpid-tools
+ - pip3 install kombu psycopg2 requests lxml xmljson pygcn python-dateutil django djangorestframework djangorestframework-xml django-auth-ldap mysql-connector testing.mysqld testing.postgresql
 
 stages:
   - build
@@ -11,11 +13,7 @@ stages:
 build_TriggerServices:
   stage: build
   script:
-    - PACKAGE=TriggerServices
-    - echo "[$PACKAGE] Installing dependencies..."
-    - yum -y install log4cplus-devel postgresql-devel openldap-devel readline-devel qpid-cpp-server qpid-cpp-client-devel qpid-tools
-    - pip3 install kombu psycopg2 requests lxml xmljson pygcn python-dateutil django djangorestframework djangorestframework-xml django-auth-ldap mysql-connector testing.mysqld testing.postgresql
-    - echo "[$PACKAGE] Building..."
+    - echo "Building TriggerServices..."
     - mkdir -p build/gnucxx11_opt 
     - cd build/gnucxx11_opt
     - cmake -DBUILD_PACKAGES=TriggerServices ../.. 
@@ -28,5 +26,6 @@ build_TriggerServices:
 test:
   stage: test
   script:
-    - echo "Testing..."
+    - echo "Testing TriggerServices..."
+    - cd build/gnucxx11_opt
     - ctest
\ No newline at end of file