diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6524a3fd7cb85e8093c49e99c381fdbc7c0230c9..1bc87f19a75ebeec1b0f4efc381c15a59272730c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,17 +20,26 @@ stages:
 before_script:
 - pip install -e .[dev]
 
+python3.6:
+  image: python:3.6
+  tags:
+  - passoft
+  stage: test
+  script:
+  - python -m unittest
 
-python2:
-  image: python:2.7
+python3.7:
+  image: python:3.7
   tags:
   - passoft
   stage: test
-  script: tox -e py27
+  script:
+  - python -m unittest
 
-python3:
-  image: python:3.6
+python3.8:
+  image: python:3.8
   tags:
   - passoft
   stage: test
-  script: tox -e py36
+  script:
+  - python -m unittest
diff --git a/tox.ini b/tox.ini
index 5482bdfbbba7662cec49153b3c31307252b7e8d1..bf6c0725b91a09d47ebc02bcfec374415d4ecfc9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,5 @@
 [tox]
-envlist = py27, py36 flake8
-
-[travis]
-python =
-    2.7: py27
-    3.6: py36
-
-[testenv:flake8]
-basepython = python
-deps = flake8
-commands = flake8 fixhdr
+envlist = py36, py37, py38
 
 [testenv]
-setenv =
-    PYTHONPATH = {toxinidir}
-commands=python setup.py test
-
-
+commands = python -m unittest