diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7095eef1678233914fc6d7216c166e280f924d2a..144b2a698e178a30b80096f50b80823d3ff93806 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,15 @@
-image: debian:stretch
+image: ubuntu:bionic
 
 before_script:
   - dpkg --add-architecture i386
+  - add-apt-repository -y ppa:snaipewastaken/ppa
   - apt-get update
-  - apt-get install libx11-dev:i386 libc6-dev-i386 libx11-dev libc6-dev build-essential  -y
+  - apt-get install libx11-dev:i386 libc6-dev-i386 libx11-dev libc6-dev build-essential criterion-dev -y
+
+stages:
+  - build
+  - test
+  - deploy
 
 make:
   stage: build
@@ -12,6 +18,14 @@ make:
   tags:
     - docker
 
+unit-tests:
+  stage: test
+  script:
+    - make test
+    - ./test/test
+  tags:
+    - docker
+
 publish-docs:
   stage: deploy
   before_script: