diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a982210..23bf9a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,38 @@
-image: python:2.7
-
 before_script:
-    #- apt-get update -qq && apt-get install -y -qq python python-pip
-    - python --version
-    - pip install -r requirements.txt
+    - pip install tox setuptools
+cache:
+    paths:
+    - /root/.cache
 
-types:
+stages:
     - test
 
-job_test:
-    type: test
+py27:
+    stage: test
+    image: python:2.7
     script:
-        - make test
+    - tox -e py27
+
+py33:
+    stage: test
+    image: python:3.3
+    script:
+    - tox -e py33
+
+py34:
+    stage: test
+    image: python:3.4
+    script:
+    - tox -e py34
+
+py35:
+    stage: test
+    image: python:3.5
+    script:
+    - tox -e py35
+
+pypy:
+    stage: test
+    image: python:pypy
+    script:
+    - tox -e pypy
diff --git a/tox.ini b/tox.ini
index 64553ae..07ba670 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,8 @@
 [tox]
 envlist = py27,py33,py34,py35,pypy
+
 [testenv]
-deps=-rrequirements.txt
-commands=py.test tests.py
+deps=
+  -rrequirements.txt
+commands=
+  py.test tests.py