diff --git a/docker-compose.yml b/docker-compose.yml
index b7a920ccd..76a2d2a84 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   database:
-    container_name: wpbrowser_4_database
+    container_name: wpbrowser_3.5_database
     image: mariadb:10.8
     environment:
       MYSQL_ROOT_PASSWORD: ${WORDPRESS_DB_PASSWORD}
diff --git a/tests/.env b/tests/.env
index ba6226053..8453c9012 100644
--- a/tests/.env
+++ b/tests/.env
@@ -1,27 +1,27 @@
 WORDPRESS_ROOT_DIR=var/wordpress
-WORDPRESS_URL=http://localhost:2389
-WORDPRESS_DOMAIN=localhost:2389
-WORDPRESS_SUBDIR_URL=http://localhost:2389/subdir
-WORDPRESS_SUBDOMAIN_URL=http://test1.localhost:2389
+WORDPRESS_URL=http://localhost:3589
+WORDPRESS_DOMAIN=localhost:3589
+WORDPRESS_SUBDIR_URL=http://localhost:3589/subdir
+WORDPRESS_SUBDOMAIN_URL=http://test1.localhost:3589
 WORDPRESS_ADMIN_USER=admin
 WORDPRESS_ADMIN_PASSWORD=admin
-WORDPRESS_DB_DSN=mysql:host=127.0.0.1;port=2391;dbname=wordpress
-WORDPRESS_DB_HOST=127.0.0.1:2391
+WORDPRESS_DB_DSN=mysql:host=127.0.0.1;port=3591;dbname=wordpress
+WORDPRESS_DB_HOST=127.0.0.1:3591
 WORDPRESS_DB_NAME=wordpress
 WORDPRESS_DB_USER=root
 WORDPRESS_DB_PASSWORD=password
-WORDPRESS_DB_URL=mysql://root:password@127.0.0.1:2391/wordpress
-WORDPRESS_DB_LOCALHOST_PORT=2391
-WORDPRESS_SUBDIR_DB_DSN=mysql:host=127.0.0.1;port=2391;dbname=test_subdir
+WORDPRESS_DB_URL=mysql://root:password@127.0.0.1:3591/wordpress
+WORDPRESS_DB_LOCALHOST_PORT=3591
+WORDPRESS_SUBDIR_DB_DSN=mysql:host=127.0.0.1;port=3591;dbname=test_subdir
 WORDPRESS_SUBDIR_DB_NAME=test_subdir
-WORDPRESS_SUBDOMAIN_DB_DSN=mysql:host=127.0.0.1;port=2391;dbname=test_subdomain
+WORDPRESS_SUBDOMAIN_DB_DSN=mysql:host=127.0.0.1;port=3591;dbname=test_subdomain
 WORDPRESS_SUBDOMAIN_DB_NAME=test_subdomain
-WORDPRESS_EMPTY_DB_DSN=mysql:host=127.0.0.1;port=2391;dbname=empty
+WORDPRESS_EMPTY_DB_DSN=mysql:host=127.0.0.1;port=3591;dbname=empty
 WORDPRESS_EMPTY_DB_NAME=empty
 WORDPRESS_TABLE_PREFIX=wp_
-WORDPRESS_LOCALHOST_PORT=2389
+WORDPRESS_LOCALHOST_PORT=3589
 CHROMEDRIVER_HOST=localhost
-CHROMEDRIVER_PORT=2390
+CHROMEDRIVER_PORT=3590
 CHROMEDRIVER_BINARY=vendor/bin/chromedriver
 TEST_TMP_ROOT_DIR=var/tmp
 TEST_CACHE_DIR=var/tmp/_cache