diff --git a/.ahoy.yml b/.ahoy.yml
index b2fc743..969fe73 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -6,7 +6,7 @@ commands:
     usage: Build project.
     cmd: |
       docker compose up -d "$@" &&
-      docker compose exec -T test dockerize -wait tcp://mariadb:3306 -timeout 2m &&
+      docker compose exec -T cli dockerize -wait tcp://mariadb:3306 -timeout 2m &&
       ahoy info;
 
   down:
@@ -26,7 +26,7 @@ commands:
     usage: Build project.
     cmd: |
       docker compose up -d --build "$@" &&
-      docker compose exec -T test dockerize -wait tcp://mariadb:3306 -timeout 2m &&
+      docker compose exec -T cli dockerize -wait tcp://mariadb:3306 -timeout 2m &&
       ahoy govcms-deploy && ahoy info;
 
   cli:
diff --git a/docker-compose.yml b/docker-compose.yml
index 5be592a..7f84131 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -66,22 +66,6 @@ services:
     volumes_from: ### Local overrides to mount host SSH keys. Automatically removed in CI.
       - container:amazeeio-ssh-agent ### Local overrides to mount host SSH keys. Automatically removed in CI.
 
-  test:
-    build:
-      context: .
-      dockerfile: .docker/Dockerfile.test
-      args:
-        CLI_IMAGE: *lagoon-project
-        GOVCMS_IMAGE_VERSION: *govcms-image-version
-        SITE_AUDIT_VERSION: ${SITE_AUDIT_VERSION:-7.x-3.x}
-    labels:
-      lagoon.type: none
-    << : *default-volumes
-    depends_on:
-      - cli
-    environment:
-      << : *default-environment
-
   nginx:
     build:
       context: .
@@ -151,15 +135,33 @@ services:
   #   environment:
   #     << : *default-environment
 
-  chrome:
-    image: selenium/standalone-chrome:4.5.2-20221021
-    shm_size: '1gb'
-    platform: linux/amd64
-    depends_on:
-      - test
-    labels:
-      lagoon.type: none
-    << : *default-volumes
+  # Uncomment to enable testing.
+  # test:
+  #   build:
+  #     context: .
+  #     dockerfile: .docker/Dockerfile.test
+  #     args:
+  #       CLI_IMAGE: *lagoon-project
+  #       GOVCMS_IMAGE_VERSION: *govcms-image-version
+  #       SITE_AUDIT_VERSION: ${SITE_AUDIT_VERSION:-7.x-3.x}
+  #   labels:
+  #     lagoon.type: none
+  #   << : *default-volumes
+  #   depends_on:
+  #     - cli
+  #   environment:
+  #     << : *default-environment
+
+  # Uncomment to enable chrome.
+  # chrome:
+  #   image: selenium/standalone-chrome:4.5.2-20221021
+  #   shm_size: '1gb'
+  #   platform: linux/amd64
+  #   depends_on:
+  #     - test
+  #   labels:
+  #     lagoon.type: none
+  #   << : *default-volumes
 
 networks:
   amazeeio-network: