diff --git a/pytest.ini b/pytest.ini
--- a/pytest.ini
+++ b/pytest.ini
@@ -4,7 +4,11 @@ pylons_config = rhodecode/tests/rhodecod
 vcsserver_protocol = http
 vcsserver_config_http = rhodecode/tests/vcsserver_http.ini
 norecursedirs = tests/scripts
-addopts = -k "not _BaseTest"
+
+addopts =
+  -k "not _BaseTest"
+  --pdbcls=IPython.terminal.debugger:TerminalPdb
+
 markers =
   vcs_operations: Mark tests depending on a running RhodeCode instance.
   xfail_backends: Mark tests as xfail for given backends.