diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f4e419c0142258f9fcba9fa7d407a0332044b59..a413d9ab273af7f8ccb13e2c3e406b77f03bc37a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,3 +5,11 @@ pylint_check:
   script:
     - source /afs/cern.ch/atlas/project/tdaq/cmake/cmake_tdaq/bin/cm_setup.sh nightly
     - /cvmfs/sft.cern.ch/lcg/views/$TDAQ_LCG_RELEASE/$CMTCONFIG/bin/pylint $(find Script/ -name '*.py' -a -not -name config.py) || exit 1
+
+unit_tests:
+  image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
+  tags:
+    - tdaq
+  script:
+    - source /afs/cern.ch/atlas/project/tdaq/cmake/cmake_tdaq/bin/cm_setup.sh nightly
+    - python -m unittest discover --top-level-directory "Script/" --start-directory "Script/UnitTests/" --pattern "Test_*.py" --verbose
\ No newline at end of file
diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index 100fb8037ef4ab59aeeaf3fc802a7d9c0ca1692c..e1d08fa19c00e7b51a6e555f4f287bfb9e5dd7fc 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -3,3 +3,6 @@ TOPDIR=$(cd `dirname $0` && echo `pwd`"/Script" )
 STARTDIR=$(echo $TOPDIR"/UnitTests")
 
 python -m unittest discover -t $TOPDIR -s $STARTDIR -p "Test_*.py"  -f
+
+#for Gitlab CI:
+# python -m unittest discover --top-level-directory "Script/" --start-directory "Script/UnitTests/" --pattern "Test_*.py" --verbose
\ No newline at end of file