Index: Bugzilla/DaemonControl.pm
===================================================================
--- Bugzilla/DaemonControl.pm
+++ Bugzilla/DaemonControl.pm
@@ -176,11 +176,10 @@
 
 sub assert_httpd {
   my $loop   = IO::Async::Loop->new;
-  my $port   = $ENV{PORT} // 8000;
   my $repeat = repeat {
     $loop->delay_future(after => 0.25)->then(
       sub {
-        Future->wrap(get("http://localhost:$port/__lbheartbeat__") // '');
+        Future->wrap(get("http://localhost:3000/__lbheartbeat__") // '');
       },
     );
   }
Index: Bugzilla/Util.pm
===================================================================
--- Bugzilla/Util.pm
+++ Bugzilla/Util.pm
@@ -978,7 +978,7 @@
     || Bugzilla->memcached->get_data({key => $key});
 
   unless ($versions) {
-    my $ua = Mojo::UserAgent->new(request_timeout => 30, connect_timeout => 5);
+    my $ua = Mojo::UserAgent->new(request_timeout => 30, connect_timeout => 30);
     if (my $proxy_url = Bugzilla->params->{'proxy_url'}) {
       $ua->proxy->http($proxy_url);
     }
Index: bugzilla.pl
===================================================================
--- bugzilla.pl
+++ bugzilla.pl
@@ -14,7 +14,5 @@
 }
 use Mojolicious::Commands;
 
-$ENV{MOJO_LISTEN} ||= $ENV{PORT} ? "http://*:$ENV{PORT}" : "http://*:3001";
-
 # Start command line interface for application
 Mojolicious::Commands->start_app('Bugzilla::App');
Index: docker-compose.test.yml
===================================================================
--- docker-compose.test.yml
+++ docker-compose.test.yml
@@ -6,6 +6,12 @@
 
 services:
   bmo.test:
+    image: nginx:alpine
+    volumes:
+      - ./docker/nginx/site.conf:/etc/nginx/conf.d/default.conf:ro
+    restart: on-failure
+
+  bmo.web:
     image: bmo
     command: dev_httpd
     tmpfs:
@@ -29,13 +35,14 @@
       - LOCALCONFIG_ENV=1
       - LOG4PERL_CONFIG_FILE=log4perl-test.conf
       - LOGGING_PORT=5880
-      - PORT=8000
+      - PORT=3000
       - TWD_BROWSER=firefox
       - TWD_HOST=selenium
       - TWD_PORT=4444
     depends_on:
       - externalapi.test
       - bmo.db
+      - bmo.test
       - memcached
       - selenium
 
Index: docker-compose.yml
===================================================================
--- docker-compose.yml
+++ docker-compose.yml
@@ -6,6 +6,15 @@
 
 services:
   bmo.test:
+    image: nginx:alpine
+    volumes:
+      - ./docker/nginx/site.conf:/etc/nginx/conf.d/default.conf:ro
+    restart: on-failure
+    depends_on:
+      - bmo.web
+      - tinyproxy
+
+  bmo.web:
     build: &bmo_build
       context: .
       dockerfile: Dockerfile
@@ -32,8 +41,6 @@
       - HTTP_BACKEND=morbo
       - LOCALCONFIG_ENV=1
       - LOG4PERL_CONFIG_FILE=log4perl-docker.conf
-      - MOJO_LISTEN=http://*:80
-      - PORT=80
     depends_on:
       - bmo.db
       - memcached
Index: qa/t/lib/QA/Util.pm
===================================================================
--- qa/t/lib/QA/Util.pm
+++ qa/t/lib/QA/Util.pm
@@ -458,7 +458,7 @@
   my $uri = URI->new($sel->get_location);
 
   foreach my $u ($expected_uri, $uri) {
-    $u->host('HOSTNAME:8000');
+    $u->host('HOSTNAME:3000');
     # Remove list id from newquery param
     if ($u->query_param('newquery')) {
       my $newquery = $u->query_param('newquery');
Index: scripts/entrypoint.pl
===================================================================
--- scripts/entrypoint.pl
+++ scripts/entrypoint.pl
@@ -170,7 +170,7 @@
 
 sub cmd_test_qa {
   my $test_files = shift;
-  $ENV{HTTP_BACKEND} = 'simple';
+  $ENV{HTTP_BACKEND} = 'hypnotoad';
 
   cmd_load_test_data();
   check_data_dir();