diff --git a/.gitlab/ci/lint.gitlab-ci.yml b/.gitlab/ci/lint.gitlab-ci.yml
index c6967d5a5..8db1ee756 100644
--- a/.gitlab/ci/lint.gitlab-ci.yml
+++ b/.gitlab/ci/lint.gitlab-ci.yml
@@ -1,24 +1,43 @@
 ########################################
 # LINTER
 ########################################
+# later we must fix lint and format-check jobs and remove "allow_failure"
 
-lint:
+lint27:
   stage: lint
   image: "before-install"
   needs: []
   allow_failure: true
   script:
-    - tox -e lint
+    - tox -e py27-lint
 
-invalidcode:
+lint37:
+  stage: lint
+  image: "before-install"
+  needs: []
+  allow_failure: true
+  script:
+    - tox -e py37-lint
+
+invalidcode27:
   stage: lint
   image: "before-install"
   needs: []
   script:
-    - tox -e invalidcode
+    - tox -e py27-invalidcode
 
-# Disabled, waiting for buster
-#format-check:
-#  extends: .lint-stage
-#  script:
-#    - black --check --diff
+invalidcode37:
+  stage: lint
+  image: "before-install"
+  allow_failure: true
+  needs: []
+  script:
+    - tox -e py37-invalidcode
+
+format-check:
+  stage: lint
+  image: "before-install"
+  needs: []
+  allow_failure: true
+  script:
+    - tox -e py37-black
diff --git a/.travis.yml b/.travis.yml
index 8674d4d03..9a0f40674 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,18 @@ language: python
 
 matrix:
   allow_failures:
-    - env: TOXENV=lint
+    - env: TOXENV=py27-lint
+    - env: TOXENV=py37-lint
+    - env: TOXENV=py37-invalidcode
   include:
     - python: 2.7
-      env: TOXENV=py27
+      env: TOXENV=py27-lint
     - python: 2.7
-      env: TOXENV=lint
+      env: TOXENV=py27-invalidcode
+    - python: 3.7
+      env: TOXENV=py37-lint
+    - python: 3.7
+      env: TOXENV=py37-invalidcode
 
 install:
   - pip install tox
diff --git a/tox.ini b/tox.ini
index 4598ad3d3..0c0b01a5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,25 +1,12 @@
 [tox]
-envlist = 
-  py27
-  lint
-skipdist = True
+envlist = py{27,37}-{lint,invalidcode},py37-black
 
 [testenv]
 skip_install=True
 deps =
-  pytest >= 4.6.3, < 5.0
-  pyyaml >= 5.1.2, < 6.0
-  flake8 >= 3.7.9, < 3.8
-  urllib3
+  py{27,37}-{lint,invalidcode}: flake8
+  py37-black: black
 commands =
-    pytest {posargs}
-
-[testenv:lint]
-skip_install=True
-commands = flake8 src doc data tests
-deps = flake8
-
-[testenv:invalidcode]
-skip_install=True
-commands = flake8 src data --exclude src/yunohost/tests --select F --ignore F401,F841
-deps = flake8
+        py{27,37}-lint: flake8 src doc data tests
+        py{27,37}-invalidcode: flake8 src data --exclude src/yunohost/tests --select F --ignore F401,F841
+        py37-black: black --check --diff src doc data tests
\ No newline at end of file