diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db524a5..ce19e8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,17 +14,13 @@ stages:
 
 .test: &test_definition
   variables:
-    PIP_CACHE_DIR: "$CI_PROJECT_DIR/pip-cache"
+    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.eggs"
   cache:
     paths:
-      - .venv/
-      - pip-cache/
+      - .eggs/
     key: "$CI_PROJECT_NAME"
   stage: test
   script:
-    - pip install virtualenv
-    - virtualenv -q .venv
-    - source .venv/bin/activate
     - python setup.py test
   
 test-3.5:
@@ -46,8 +42,8 @@ test-2.7:
   before_script:
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
   script:
-    - docker build -f Dockerfile-3.5 . -t $CI_REGISTRY_IMAGE:$CI_BUILD_TAG-$PYTHON_VERSION
-    - docker push $CI_REGISTRY_IMAGE:$CI_BUILD_TAG-$PYTHON_VERSION
+    - docker build -f Dockerfile-3.5 . -t $CI_REGISTRY_IMAGE:$CI_BUILD_REF_SLUG-$PYTHON_VERSION
+    - docker push $CI_REGISTRY_IMAGE:$CI_BUILD_REF_SLUG-$PYTHON_VERSION
   stage: images
   only:
     - tags