diff --git a/.travis.yml b/.travis.yml
index d45f1d49..c9945281 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ before_install:
   - yes | pecl install pdo_sqlsrv-5.9.0preview1 swoole-4.5.5 pcov
 
 install:
-  - composer self-update --1
+  - composer self-update
   - composer install --no-interaction --prefer-dist $COMPOSER_FLAGS
 
 before_script:
diff --git a/Dockerfile b/Dockerfile
index b8bdda10..41fce03a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,7 @@ RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS && \
 # Install shlink
 FROM base as builder
 COPY . .
-COPY --from=composer:1.10.13 /usr/bin/composer ./composer.phar
+COPY --from=composer:2 /usr/bin/composer ./composer.phar
 RUN apk add --no-cache git && \
     php composer.phar install --no-dev --optimize-autoloader --prefer-dist --no-progress --no-interaction && \
     php composer.phar clear-cache && \
diff --git a/composer.json b/composer.json
index c346e661..716cfe31 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,6 @@
         "guzzlehttp/guzzle": "^7.0",
         "laminas/laminas-config": "^3.3",
         "laminas/laminas-config-aggregator": "^1.1",
-        "laminas/laminas-dependency-plugin": "^1.0",
         "laminas/laminas-diactoros": "^2.1.3",
         "laminas/laminas-inputfilter": "^2.10",
         "laminas/laminas-paginator": "^2.8",
diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile
index 0e10911e..218db4c5 100644
--- a/data/infra/php.Dockerfile
+++ b/data/infra/php.Dockerfile
@@ -64,7 +64,7 @@ RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8
     rm msodbcsql17_17.5.1.1-1_amd64.apk
 
 # Install composer
-COPY --from=composer:1.10.13 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 
 # Make home directory writable by anyone
 RUN chmod 777 /home
diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile
index 6dafa0eb..5d8485ab 100644
--- a/data/infra/swoole.Dockerfile
+++ b/data/infra/swoole.Dockerfile
@@ -76,7 +76,7 @@ RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8
     rm msodbcsql17_17.5.1.1-1_amd64.apk
 
 # Install composer
-COPY --from=composer:1.10.13 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 
 # Make home directory writable by anyone
 RUN chmod 777 /home
diff --git a/module/CLI/test/Command/Visit/LocateVisitsCommandTest.php b/module/CLI/test/Command/Visit/LocateVisitsCommandTest.php
index 3eb89f57..966a702c 100644
--- a/module/CLI/test/Command/Visit/LocateVisitsCommandTest.php
+++ b/module/CLI/test/Command/Visit/LocateVisitsCommandTest.php
@@ -94,9 +94,9 @@ class LocateVisitsCommandTest extends TestCase
 
         self::assertStringContainsString('Processing IP 1.2.3.0', $output);
         if ($expectWarningPrint) {
-            self::assertStringContainsString('Continue at your own risk', $output);
+            self::assertStringContainsString('Continue at your own', $output);
         } else {
-            self::assertStringNotContainsString('Continue at your own risk', $output);
+            self::assertStringNotContainsString('Continue at your own', $output);
         }
         $locateVisits->shouldHaveBeenCalledTimes($expectedUnlocatedCalls);
         $locateEmptyVisits->shouldHaveBeenCalledTimes($expectedEmptyCalls);