diff --git a/docker/dev-mariadb/settings.conf b/docker/dev-mariadb/settings.conf
index f686bf59ed8..1c80db66c4f 100644
--- a/docker/dev-mariadb/settings.conf
+++ b/docker/dev-mariadb/settings.conf
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# -*- coding: utf-8 -*-
+
+import os
 
 SECRET_KEY = 'SECRETKEY'
 ALLOWED_HOSTS = [
@@ -9,11 +10,19 @@ ALLOWED_HOSTS = [
 ]
 
 DATABASES['default']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['default']['NAME'] = 'pootle'
-DATABASES['default']['USER'] = 'travis'
+DATABASES['default']['NAME'] = 'pootledb'
+DATABASES['default']['USER'] = 'pootle'
+if os.environ.get("TRAVIS"):
+   DATABASES['default']['USER'] = 'travis'
+DATABASES['default']['HOST'] = 'mariadb'
+DATABASES['default']['PASSWORD'] = 'CHANGEME'
 DATABASES['default']['TEST'] = dict(
     COLLATION='utf8_general_ci',
     NAME='',
     CHARSET='utf8')
 DATABASES['default']['OPTIONS'] = {
     'init_command': "SET sql_mode='STRICT_ALL_TABLES'"}
+
+CACHES['default']['LOCATION'] = 'redis://redis:6379/1'
+CACHES['redis']['LOCATION'] = 'redis://redis:6379/2'
+CACHES['lru']['LOCATION'] = 'redis://redis:6379/3'
diff --git a/docker/dev-postgres/settings.conf b/docker/dev-postgres/settings.conf
index 0e2e58017a2..35b58bef8d3 100644
--- a/docker/dev-postgres/settings.conf
+++ b/docker/dev-postgres/settings.conf
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+import os
+
 SECRET_KEY = 'SECRETKEY'
 ALLOWED_HOSTS = [
     '127.0.0.1',
@@ -8,5 +10,13 @@ ALLOWED_HOSTS = [
 ]
 
 DATABASES['default']['ENGINE'] = 'django.db.backends.postgresql'
-DATABASES['default']['NAME'] = 'pootle'
+DATABASES['default']['NAME'] = 'pootledb'
 DATABASES['default']['USER'] = 'postgres'
+if os.environ.get("TRAVIS"):
+   DATABASES['default']['USER'] = 'travis'
+DATABASES['default']['HOST'] = 'postgres'
+DATABASES['default']['PASSWORD'] = 'CHANGEME'
+
+CACHES['default']['LOCATION'] = 'redis://redis:6379/1'
+CACHES['redis']['LOCATION'] = 'redis://redis:6379/2'
+CACHES['lru']['LOCATION'] = 'redis://redis:6379/3'
diff --git a/docker/dev-sqlite/settings.conf b/docker/dev-sqlite/settings.conf
index 8e1f97d7160..b1d25c1adea 100644
--- a/docker/dev-sqlite/settings.conf
+++ b/docker/dev-sqlite/settings.conf
@@ -6,3 +6,7 @@ ALLOWED_HOSTS = [
     'localhost',
     #'${your_server}',
 ]
+
+CACHES['default']['LOCATION'] = 'redis://redis:6379/1'
+CACHES['redis']['LOCATION'] = 'redis://redis:6379/2'
+CACHES['lru']['LOCATION'] = 'redis://redis:6379/3'
diff --git a/requirements/base.txt b/requirements/base.txt
index 5c0c972c90c..34662e06150 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -11,7 +11,7 @@ django-bulk-update==2.2.0
 django-contact-form==1.5
 django-contrib-comments==1.7.3,!=1.8.0  # rq.filter: !=1.8.0
 django-overextends==0.4.3
-django-redis==4.9.0
+django-redis==4.10.0
 django-rq==1.0.1
 django-sortedm2m==1.5.0
 django-statici18n==1.7.0
diff --git a/setup.cfg b/setup.cfg
index 9d4ea2833ac..e9bd9b9b01d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [tool:pytest]
 python_files=*.py
-addopts=--tb=short --strict
+addopts=--tb=short --strict -x
 testpaths=tests
 norecursedirs=.git _build tmp* requirements commands/*
 markers=