diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abe39145..cfd7d6af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,29 @@
-test:
-  tags:
-    - docker
-  image: ubuntu:latest
+stages:
+  - build
+  - test
+
+build-ubuntu:
+  stage: build
+  image: poezio/build-base:latest
+  script:
+    - python3 setup.py sdist
+    - python3 setup.py bdist
+  artifacts:
+    expire_in: 2 weeks
+    paths:
+      - dist/
+
+test-ubuntu:
+  stage: test
+  image: poezio/test-base:latest
   script:
-    - apt update
-    - apt install -y python3 cython3 git python3-setuptools python3-pyasn1
     - git clone git://git.louiz.org/slixmpp
+    - pip3 install --upgrade pip
+    - pip3 install pytest pyasn1-modules --upgrade
     - pushd slixmpp
     - python3 setup.py build
     - python3 setup.py install
     - popd
-    - python3 setup.py test
+    - python3 setup.py install
+    - py.test -v test/
+    - pylint -E poezio
diff --git a/setup.py b/setup.py
index 49677d87..7d73e4f3 100755
--- a/setup.py
+++ b/setup.py
@@ -106,9 +106,10 @@ setup(name="poezio",
                    ('share/poezio/', ['README.rst', 'COPYING', 'CHANGELOG'])]
                   + find_doc('share/doc/poezio/source', 'source')
                   + find_doc('share/doc/poezio/html', 'build/html')),
-      install_requires=['slixmpp>=1.2.4', 'aiodns', 'pyasn1', 'pyasn1_modules'],
+      install_requires=['slixmpp>=1.2.4', 'aiodns', 'pyasn1_modules', 'pyasn1'],
       extras_require={'OTR plugin': 'python-potr>=1.0',
-                      'Screen autoaway plugin': 'pyinotify==0.9.4'})
+                      'Screen autoaway plugin': 'pyinotify==0.9.4',
+                      'Avoiding cython': 'cffi'})
 
 # Remove the link afterwards
 if (exists(join(current_dir, 'poezio', 'default_config.cfg')) and