diff --git a/tests/_data/acceptanceDump.sql b/tests/_data/acceptanceDump.sql
index eac17aa57c..3c30121458 100644
--- a/tests/_data/acceptanceDump.sql
+++ b/tests/_data/acceptanceDump.sql
@@ -530,8 +530,8 @@ CREATE TABLE `mp_options` (
   UNIQUE KEY `option_name` (`option_name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-INSERT INTO `mp_options` VALUES (1,'siteurl','http://wordpress','yes'),
-(2,'home','http://wordpress','yes'),
+INSERT INTO `mp_options` VALUES (1,'siteurl','http://test.local','yes'),
+(2,'home','http://test.local','yes'),
 (3,'blogname','MP Dev','yes'),
 (4,'blogdescription','Just another WordPress site','yes'),
 (5,'users_can_register','1','yes'),
@@ -779,7 +779,7 @@ CREATE TABLE `mp_posts` (
 INSERT INTO `mp_posts` (`ID`, `post_author`, `post_date`, `post_date_gmt`, `post_content`, `post_title`, `post_excerpt`, `post_status`, `comment_status`, `ping_status`, `post_password`, `post_name`, `to_ping`, `pinged`, `post_modified`, `post_modified_gmt`, `post_content_filtered`, `post_parent`, `guid`, `menu_order`, `post_type`, `post_mime_type`, `comment_count`) VALUES
 (1,	1,	'2016-11-23 14:16:53',	'2016-11-23 14:16:53',	'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!',	'Hello world!',	'',	'publish',	'open',	'open',	'',	'hello-world',	'',	'',	'2016-11-23 14:16:53',	'2016-11-23 14:16:53',	'',	0,	'http://mailpoet/?p=1',	0,	'post',	'',	1),
 (4,	1,	'2016-11-23 18:32:23',	'2016-11-23 18:32:23',	'[mailpoet_page]',	'MailPoet Page',	'',	'publish',	'closed',	'closed',	'',	'subscriptions',	'',	'',	'2016-11-23 18:32:23',	'2016-11-23 18:32:23',	'',	0,	'http://mailpoet/2016/11/23/subscriptions/',	0,	'mailpoet_page',	'',	0),
-(470,	1,	'2017-11-05 23:48:01',	'2017-11-05 23:48:01',	'Regular form:\r\n\r\n[mailpoet_form id=\"1\"]\r\n\r\nIframe form:\r\n\r\n<iframe class=\"mailpoet_form_iframe\" id=\"mailpoet_form_iframe\" tabindex=\"0\" src=\"http://wordpress?mailpoet_form_iframe=1\" width=\"100%\" height=\"100%\" frameborder=\"0\" marginwidth=\"0\" marginheight=\"0\" scrolling=\"no\"></iframe>',	'Form Test',	'',	'publish',	'closed',	'closed',	'',	'form-test',	'',	'',	'2017-11-05 23:58:38',	'2017-11-05 23:58:38',	'',	0,	'http://wordpress/?page_id=470',	0,	'page',	'',	0);
+(470,	1,	'2017-11-05 23:48:01',	'2017-11-05 23:48:01',	'Regular form:\r\n\r\n[mailpoet_form id=\"1\"]\r\n\r\nIframe form:\r\n\r\n<iframe class=\"mailpoet_form_iframe\" id=\"mailpoet_form_iframe\" tabindex=\"0\" src=\"http://test.local?mailpoet_form_iframe=1\" width=\"100%\" height=\"100%\" frameborder=\"0\" marginwidth=\"0\" marginheight=\"0\" scrolling=\"no\"></iframe>',	'Form Test',	'',	'publish',	'closed',	'closed',	'',	'form-test',	'',	'',	'2017-11-05 23:58:38',	'2017-11-05 23:58:38',	'',	0,	'http://wordpress/?page_id=470',	0,	'page',	'',	0);
 
 DROP TABLE IF EXISTS `mp_signups`;
 CREATE TABLE `mp_signups` (
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index f4e0caa64b..baafb7e158 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -31,7 +31,7 @@ class AcceptanceTester extends \Codeception\Actor {
     waitForText as _waitForText;
   }
 
-  const WP_URL = 'http://wordpress';
+  const WP_URL = 'http://test.local';
   const MAIL_URL = 'http://mailhog:8025';
 
   /**
diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml
index 5d495a95c3..6b9421a58f 100644
--- a/tests/acceptance.suite.yml
+++ b/tests/acceptance.suite.yml
@@ -15,7 +15,7 @@ modules:
             activatePlugins: ['mailpoet/mailpoet.php']
         - WPWebDriver:
             host: chrome
-            url: 'http://wordpress'
+            url: 'http://test.local'
             browser: chrome
             port: 4444
             window_size: '1024x768'
@@ -32,9 +32,9 @@ modules:
             dump: tests/_data/acceptanceGenerated.sql
             populate: true
             cleanup: false
-            url: 'http://wordpress'
+            url: 'http://test.local'
             urlReplacement: true
             tablePrefix: 'mp_'
         - WPCLI:
             path: /wp-core
-            throw: true
\ No newline at end of file
+            throw: true
diff --git a/tests/acceptance/SubscriptionFormCest.php b/tests/acceptance/SubscriptionFormCest.php
index 9eb01b7f7e..5817c6faac 100644
--- a/tests/acceptance/SubscriptionFormCest.php
+++ b/tests/acceptance/SubscriptionFormCest.php
@@ -81,7 +81,7 @@ class SubscriptionFormCest {
     $I->see('You have subscribed');
     $I->seeNoJSErrors();
 
-    $I->amOnUrl('http://wordpress');
+    $I->amOnUrl(\AcceptanceTester::WP_URL);
     $I->login();
     $I->amOnMailpoetPage('Subscribers');
     $I->waitForText($this->subscriber_email);
diff --git a/tests/docker/codeception/docker-entrypoint.sh b/tests/docker/codeception/docker-entrypoint.sh
index 43e50ae026..1ee8900ec9 100644
--- a/tests/docker/codeception/docker-entrypoint.sh
+++ b/tests/docker/codeception/docker-entrypoint.sh
@@ -28,7 +28,7 @@ if ! $(wp-su core is-installed); then
 
       echo "Running in single site mode"
 
-      wp-su core install --url=wordpress --title=tests --admin_user=admin --admin_email=test@test.com
+      wp-su core install --url=test.localhost --title=tests --admin_user=admin --admin_email=test@test.com
 
       cp /project/tests/_data/acceptanceDump.sql /project/tests/_data/acceptanceGenerated.sql
 
diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml
index 11291044bb..5357f90c06 100644
--- a/tests/docker/docker-compose.yml
+++ b/tests/docker/docker-compose.yml
@@ -47,6 +47,10 @@ services:
       interval: 1m30s
       timeout: 10s
       retries: 3
+    networks:
+      default:
+        aliases:
+          - test.local
 
   mysql:
     image: circleci/mysql:5.7-ram
@@ -73,3 +77,6 @@ services:
       - 5900:5900
 volumes:
   wp-core:
+
+networks:
+  default: