diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d9a7e77dd6a57b04c38209f6a232c795953992d..84aa5c5690bb76062bd24175b24d5507109e96aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
 # Definition of our build pipeline order
 stages:
   - build
-  - docker
+  - browser-test
   - deploy
   - pypi
 
@@ -64,8 +64,8 @@ stages:
 
 
 # Docker host based testing (must be run inside dind or docker-enabled host)
-.docker_test_linux_template: &linux_docker_job
-  stage: docker
+.browser_test_linux_template: &linux_browser_test_job
+  stage: browser-test
   before_script:
     # safe keep artifacts as before_build.sh will erase those...
     - mv ${CONDA_ROOT}/conda-bld .
@@ -74,7 +74,7 @@ stages:
     - mv conda-bld ${CONDA_ROOT}
     - ./scripts/before_test.sh
   script:
-    - export BEAT_DOCKER_TESTS=true
+    - export BEAT_BROWSER_TESTS=true
     - BOB_TEST_ONLY=true ./_ci/build.sh
   after_script:
     - ./_ci/after_build.sh
@@ -113,24 +113,24 @@ build_macosx_36:
 
 
 # Docker host based testing
-docker_linux_27:
-  <<: *linux_docker_job
+browser_test_linux_27:
+  <<: *linux_browser_test_job
   variables:
     PYTHON_VERSION: "2.7"
   dependencies:
     - build_linux_27
   tags:
-    - docker-build
+    - docker
 
 
 docker_linux_36:
-  <<: *linux_docker_job
+  <<: *linux_browser_test_job
   variables:
     PYTHON_VERSION: "3.6"
   dependencies:
     - build_linux_36
   tags:
-    - docker-build
+    - docker
 
 
 # Deploy targets