diff --git a/tox.ini b/tox.ini
index 08ff6c32348..ae57ed9e716 100644
--- a/tox.ini
+++ b/tox.ini
@@ -78,6 +78,8 @@ commands =
 setenv = {[testenv]setenv}
          {[testenv:common]setenv}
          {[testenv:dsvm]setenv}
+         # workaround for DB teardown lock contention (bug/1541742)
+         OS_TEST_TIMEOUT=600
          OS_TEST_PATH=./neutron/tests/fullstack
 sitepackages=True
 deps =