diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d83a2bb170..393a66121b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,7 @@
-# This file is a template, and might need editing before it works on your project.
-# To contribute improvements to CI/CD templates, please follow the Development guide at:
-# https://docs.gitlab.com/ee/development/cicd/templates.html
-# This specific template is located at:
+# This .gitlab.ci.yml is based on:
 # https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml
+# the FPC specific parts are partly from:
+# https://gitlab.com/alb42/testconversion2/-/blob/main/.gitlab-ci.yml
 
 image: registry.gitlab.com/freepascal.org/fpc/source:buster_fpcbuild
 
@@ -13,13 +12,14 @@ stages:          # List of stages for jobs, and their order of execution
 build-job:       # This job runs in the build stage, which runs first.
   stage: build
   script:
-    - echo "Compiling the code..."
     - make -j 4 all OS_TARGET=linux CPU_TARGET=x86_64 OPT="-gl" FPMAKEOPT="-T 4"
-    - echo "Compile complete."
-
-unit-test-job:   # This job runs in the test stage.
-  stage: test    # It only starts when the job in the build stage completes successfully.
+    
+regression-test-job:   # This job runs in the test stage.
+  stage: test          # It only starts when the job in the build stage completes successfully.
   script:
-    - echo "Running unit tests... This will take about 60 seconds."
-    - sleep 60
-    - echo "Code coverage is 90%"
+    - FPC_SRC=$(pwd)
+    - FPC_COMPILER=$FPC_SRC/compiler/ppcx64
+    - cd tests
+    - make clean TEST_FPC=$FPC_COMPILER TEST_DELTEMP=1 -j 4
+    - make full TEST_FPC=$FPC_COMPILER TEST_DELTEMP=1 -j 4
+