diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a2131188d2012ffe4b72dc652d1ac14d70ad15d..5a98111693b4aad72e52115dc949e2d3c41ab8d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ stages:
     - build-packages
     - build
     - unit-test
-    - unit-test-other
     - test-coverage
     - push
     - push-packages
@@ -43,6 +42,7 @@ include:
     - '/ci/push.template.yml'
     - '/ci/cleanup.template.yml'
     - '/ci/unit-test.template.yml'
+    - '/ci/unit-test-other.template.yml'
     - '/ci/package-build.template.yml'
     - '/ci/push-package.template.yml'
 
@@ -254,12 +254,12 @@ unit test notification:
 # Test Stages for Support Modules
 ###############################################
 unit test messaging:
-  interruptible: true
-  stage: unit-test
-  variables:
-    SERVICE_NAME: "messaging"
-    PATH_PREFIX: "shared/"
-  extends: .unit-test-other
+    interruptible: true
+    stage: unit-test
+    variables:
+      SERVICE_NAME: "messaging"
+      PATH_PREFIX: "shared/"
+    extends: .unit-test-other
 
 
 ###############################################