diff --git a/BUCK b/BUCK
index f25584c..8232c2b 100644
--- a/BUCK
+++ b/BUCK
@@ -47,8 +47,8 @@
 
 maven_jar(
   name = 'wiremock',
-  id = 'com.github.tomakehurst:wiremock:1.58:standalone',
-  sha1 = '21c8386a95c5dc54a9c55839c5a95083e42412ae',
+  id = 'com.github.tomakehurst:wiremock-standalone:2.5.1',
+  sha1 = '9cda1bf1674c8de3a1116bae4d7ce0046a857d30',
   license = 'Apache2.0',
   attach_source = False,
 )
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
index 0c8ba85..7e13e37 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
@@ -20,13 +20,13 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 
 import com.google.gerrit.acceptance.GerritConfig;
 import com.google.gerrit.acceptance.GerritConfigs;
 import com.google.gerrit.acceptance.NoHttpd;
 import com.google.gerrit.acceptance.PluginDaemonTest;
 
-import com.ericsson.gerrit.plugins.highavailability.cache.Constants;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.RequestListener;
 import com.github.tomakehurst.wiremock.http.Response;
@@ -42,7 +42,7 @@
 public class CacheEvictionIT extends PluginDaemonTest {
 
   @Rule
-  public WireMockRule wireMockRule = new WireMockRule(18888);
+  public WireMockRule wireMockRule = new WireMockRule(options().port(18888), false);
 
   @Test
   @GerritConfigs({