diff --git a/.gitignore b/.gitignore
index a8df15eb48825da0fd0c601367ce15ca2beffbdf..1cad979a916cd5da1859b2cfba7d988af69f57f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ MANIFEST
 *.swp
 *.swo
 *.pyc
+*.pyo
 *.log
 *.*~
 *.csv
@@ -21,4 +22,4 @@ scripts/profiling/sync/profiles
 
 testing/htmlcov
 testing/.coverage
-testing/test-env
\ No newline at end of file
+testing/test-env
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee57c51caa55f315584994c8acd1e05d6a2ec162..da908634a09c445d7d3b06cca26b0e03bbd555ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
   - code-check
   - tests
+  - benchmark
 
 # Cache tox envs between builds
 cache:
@@ -22,3 +23,25 @@ tests:
   script:
     - cd testing
     - tox -- --couch-url http://couchdb:5984
+
+benchmark:
+  stage: benchmark
+  image: leapcode/soledad:latest
+  tags:
+    - benchmark
+  services:
+    - couchdb
+  allow_failure: true
+  script:
+    - cd testing
+    - curl -s couchdb:5984
+    # You can provide a $NETRC variable containing the creds for your
+    # elasticsearch instance so it's protected from being leaked in the
+    # CI console
+    # We can't get it working inside docker for unknown reasons.
+    #- echo "$NETRC" > /root/.netrc && chmod 600 /root/.netrc
+    #
+    # Add $PYTEST_OPTS to pytest.ini to allow posting benchmark tests
+    # to an elasticsearch instance
+    - echo "addopts=$PYTEST_OPTS" >> pytest.ini && chmod 600 pytest.ini
+    - tox --recreate -e benchmark -- --couch-url http://couchdb:5984
diff --git a/testing/tox.ini b/testing/tox.ini
index d959db0a6ca74d68f813fb0ff4ed403eb502d9d5..d800d9881fef6f82324bc232d834a33f2c150c34 100644
--- a/testing/tox.ini
+++ b/testing/tox.ini
@@ -62,7 +62,10 @@ install_command = pip3 install {opts} {packages}
 [testenv:benchmark]
 deps =
     {[testenv]deps}
-    pytest-benchmark
+    #pytest-benchmark>=3.1.0a2
+    git+https://github.com/drebs/pytest-benchmark.git@use-netrc-file
+    elasticsearch
+    certifi
 commands = py.test --benchmark-only {posargs}
 
 [testenv:code-check]