diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee1b1286676988d27444639c3079c9d64f3df833..c1fa639af12b9937e78a06c0294bec6f06b7717e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,26 +1,43 @@
-image: clarinpl/python:3.8
+image: python:latest
+
+variables:
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
 
 cache:
   paths:
     - .tox
+    - .cache/pip
 
 stages:
   - test
   - publish
 
 before_script:
-  - apt-get update -yqq
-    && apt-get install -yqq --no-install-recommends
-    make
-    g++
-    && apt-get autoremove -yqq --purge
-    && apt-get clean
-
-unittests:
-  stage: test
+  - python --version ; pip --version  # For debugging
+  - pip install virtualenv
+  - virtualenv venv
+  - source venv/bin/activate
+
+test:
   script:
-    - pip install tox==4.12
-    - tox -p -e python3.8
+    - pip install tox  # you can also use tox
+    - pip install --editable ".[test]"
+    - tox -e py
+
+
+#before_script:
+#  - apt-get update -yqq
+#    && apt-get install -yqq --no-install-recommends
+#    make
+#    g++
+#    && apt-get autoremove -yqq --purge
+#    && apt-get clean
+#
+#unittests:
+#  stage: test
+#  script:
+#    - pip install tox==4.12
+#    - tox -p -e python3.9
 
 pypi_publish:
   before_script:
diff --git a/tox.ini b/tox.ini
index 09e9986337c259bbd5c2beddd3f3ca23872d3329..bf08cc4745aafa36f9987c91488232a5c7ed503d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
-envlist = python3.8
-skipsdist = True
+envlist = py
 
 [testenv]
 deps = pytest