diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9798e64..7c33ef4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,18 @@
-build:
-  stage: build
-  script:
-    - autoreconf -fvi
-    - ./configure
-    - make rpm
-  artifacts:
-    paths:
-      - auks*rpm
+variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+
+default:
+  before_script:
+    - docker info
+    - docker-compose version
 
 
-# run tests using the binary built before
-#test:
-#  stage: test
-#  script:
-#    - ./test.sh
+test:
+  script:
+    - cd tests
+    - docker-compose build --parallel
+    - docker-compose up -d --force-recreate
+    - docker-compose exec -ti auks_server useradd -M -u 2000 auks_admin
+    - docker-compose exec -ti auks_server useradd -M -u 2001 auks_user
+    - docker-compose exec -ti auks_server useradd -M -u 2002 auks_guest
+    - docker-compose exec -ti auks_client bats /tests/bats/
diff --git a/.travis.yml b/.travis.yml
index e9e5bd1..400f63a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,9 @@
+services:
+  - docker
+
+git:
+  submodules: true
+
 language: c
 
 os: linux
@@ -6,10 +12,11 @@ arch:
   - amd64
   - arm64
 
-compiler:
-  - gcc
-
 script:
-  - autoreconf -fvi
-  - ./configure
-  - make
\ No newline at end of file
+  - cd tests
+  - docker-compose build --parallel
+  - docker-compose up -d --force-recreate
+  - docker-compose exec -ti auks_server useradd -M -u 2000 auks_admin
+  - docker-compose exec -ti auks_server useradd -M -u 2001 auks_user
+  - docker-compose exec -ti auks_server useradd -M -u 2002 auks_guest
+  - docker-compose exec -ti auks_client bats --tap /tests/bats/