diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aac7963130fc37c934109092ed8cabab6295d0b6..d0faff86c1fd929a6038b0dd0b437bd5fe2408b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,38 +13,41 @@ cache:
     - .cache/pip
     - env/
 
-before_script:
-  - python -V
-  - python3 -m venv env
-  - source env/bin/activate
-  - pip install -r requirements/production.txt
-
 stages:
-  - Build
+  - Test and Flake8
   - Docker Build
 
 Flake8:
-  stage: Build
+  stage: Test and Flake8
   only:
     - dev
     - master
   tags: [docker]
   script:
+    - python -V
+    - python3 -m venv env
+    - source env/bin/activate
+    - pip install -r requirements/production.txt
     - flake8 --max-line-length=125 --exclude=src/kszkepzes,migrations,env
 
-Test:
-  stage: Build
-  only:
-    - dev
-    - master
-  tags: [docker]
-  variables:
-    DATABASE_URL: 'postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB'
-    SECRET_KEY: 'secret'
-    AUTHSCH_KEY: 'secret'
-    AUTHSCH_SECRET: 'secret'
-  script:
-    - python src/manage.py test
+# TODO write tests
+# Test:
+#   stage: Test and Flake8
+#   only:
+#     - dev
+#     - master
+#   tags: [docker]
+#   variables:
+#     DATABASE_URL: 'postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB'
+#     SECRET_KEY: 'secret'
+#     AUTHSCH_KEY: 'secret'
+#     AUTHSCH_SECRET: 'secret'
+#   script:
+#     - python -V
+#     - python3 -m venv env
+#     - source env/bin/activate
+#     - pip install -r requirements/production.txt
+#     - python src/manage.py test
 
 Docker build:
   stage: Docker Build