diff --git a/vcsserver/tests/conftest.py b/vcsserver/tests/conftest.py
--- a/vcsserver/tests/conftest.py
+++ b/vcsserver/tests/conftest.py
@@ -16,13 +16,12 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
 import socket
-
 import pytest
 
 
 def pytest_addoption(parser):
     parser.addoption(
-        '--repeat', type=int, default=100,
+        '--perf-repeat-vcs', type=int, default=100,
         help="Number of repetitions in performance tests.")
 
 
@@ -34,7 +33,7 @@ def repeat(request):
     Slower calls may divide it by 10 or 100. It is chosen in a way so that the
     tests are not too slow in our default test suite.
     """
-    return request.config.getoption('--repeat')
+    return request.config.getoption('--perf-repeat-vcs')
 
 
 @pytest.fixture(scope='session')