diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81144f1eb54402caa56c0e214a81dd79e20ecd26..b6d59709147b8a15648febd6386ac066926d19b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,28 +1,41 @@
-# This file is a template, and might need editing before it works on your project.
-# Official language image. Look for the different tagged releases at:
-# https://hub.docker.com/r/library/python/tags/
-image: python:3.9
+python3.11:
+    stage: test
+    tags: [ci.inria.fr]
+    image: python:3.11
+    script:
+    - pip install tox
+    - tox -e py311
 
-before_script:
-- pip install tox
+python3.10:
+    stage: test
+    tags: [ci.inria.fr]
+    image: python:3.10
+    script:
+    - pip install tox
+    - tox -e py310
 
-python3.6:
+python3.9:
     stage: test
-    tags: [qlf-ci.inria.fr]
+    tags: [ci.inria.fr]
+    image: python:3.9
     script:
+    - pip install tox
     - tox -e py39
 
 pep8:
     stage: test
-    tags: [qlf-ci.inria.fr]
+    tags: [ci.inria.fr]
+    image: python:3.9
     script:
+    - pip install tox
     - tox -e pep8
 
 
 #### Entering the release zone
 pages:
     stage: deploy
-    tags: [qlf-ci.inria.fr]
+    tags: [ci.inria.fr]
+    image: python:3.9
     only:
     - tags
     script:
@@ -35,7 +48,8 @@ pages:
 
 pypi:
     stage: deploy
-    tags: [qlf-ci.inria.fr]
+    tags: [ci.inria.fr]
+    image: python:3.9
     only:
     - tags
     script:
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index b3bc185ec31f5f934a80f6feed48c531093804f9..0000000000000000000000000000000000000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-flake8>=3.3.0
-sphinx>=1.6.0
-sphinx-rtd-theme>=0.2.4
-pytest
diff --git a/tox.ini b/tox.ini
index f27255f33d194348c6e1c35aa8eb2b42a4ad7311..bf0d2bf59af479a5ce9c61e33c1d2d88e0698ba0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,25 +1,28 @@
 [tox]
 skipsdist = True
-envlist = py39, flake8
+envlist = py39, py310, py311, pep8, docs
 
 [testenv]
-whitelist_externals = make
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+   pytest
 commands =
-    /bin/rm -rf build
-    python setup.py bdist_wheel
-    pip install --upgrade  --find-links={toxinidir}/dist enos_kubernetes
-    py.test {toxinidir}/enos_kubernetes/tests/unit
-
+    pytest --pyargs {toxinidir}/enos_kubernetes {posargs}
 usedevelop = True
+
 [testenv:pep8]
+deps =
+   flake8>=3.3.0
+skip_install = true
 basepython = python
 changedir= enos_kubernetes
 commands = flake8
-deps = flake8
 distribute = false
 
 [testenv:docs]
+whitelist_externals = make
+deps =
+   sphinx>=1.6.0
+   sphinx-rtd-theme>=0.2.4
 changedir = docs/
 commands =
   make clean
@@ -35,4 +38,4 @@ commands =
 ignore = E121,E122,E123,E124,E125,E127,E128,E129,E131,E241,H405,F821
 show-source = true
 exclude = venv,.git,.tox,dist,*egg,ansible,tests
-max-line-length = 88
\ No newline at end of file
+max-line-length = 88