diff --git a/run-tests.sh b/run-tests.sh
index fb2aa6dd..0f53147e 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -93,6 +93,7 @@ check_sphinx () {
 check_pytest () {
     clean_old_db_container
     start_db_container
+    trap clean_old_db_container SIGINT SIGTERM SIGSEGV ERR
     python setup.py test
     stop_db_container
 }
diff --git a/setup.py b/setup.py
index 751bd350..5a9fd005 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@
     "apispec-webframeworks",
     "Flask>=2.1.1,<2.2.0",
     "jinja2<3.1.0",
-    "Werkzeug>=2.1.0",
+    "Werkzeug>=2.1.0,<3.0",
     "fs>=2.0",
     "marshmallow>2.13.0,<=2.20.1",
     "reana-commons[kubernetes]>=0.9.3,<0.10.0",