GC use of deprecated junit assertThat and unify

41 files changed, 251 insertions, 329 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 63c569fb17a..d3dfae3a6be 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -49,7 +49,6 @@ import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.model.VespaModelFactory;
-import org.hamcrest.core.Is;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -73,14 +72,11 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.IntStream;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -111,6 +107,7 @@ public class ApplicationRepositoryTest {
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException exceptionRule = ExpectedException.none();
 
@@ -553,13 +550,13 @@ public class ApplicationRepositoryTest {
 
         AllocatedHosts info = session.getAllocatedHosts();
         assertNotNull(info);
-        assertThat(info.getHosts().size(), is(1));
+        assertEquals(1, info.getHosts().size());
         assertTrue(info.getHosts().contains(new HostSpec("mytesthost2",
                                                          Collections.emptyList(),
                                                          Optional.empty())));
         Optional<NetworkPorts> portsCopy = info.getHosts().iterator().next().networkPorts();
         assertTrue(portsCopy.isPresent());
-        assertThat(portsCopy.get().allocations(), is(list));
+        assertEquals(list, portsCopy.get().allocations());
     }
 
     @Test
@@ -571,7 +568,7 @@ public class ApplicationRepositoryTest {
         TimeoutBudget timeoutBudget = new TimeoutBudget(clock, Duration.ofSeconds(10));
         long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, testAppJdiscOnly);
         exceptionRule.expect(IllegalArgumentException.class);
-        exceptionRule.expectMessage(containsString("tenant:test1 Session 3 is not prepared"));
+        exceptionRule.expectMessage("tenant:test1 Session 3 is not prepared");
         applicationRepository.activate(applicationRepository.getTenant(applicationId()), sessionId, timeoutBudget, false);
 
         Session activeSession = applicationRepository.getActiveSession(applicationId());
@@ -588,7 +585,7 @@ public class ApplicationRepositoryTest {
         long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, testAppJdiscOnly);
         applicationRepository.prepare(sessionId, prepareParams());
         exceptionRule.expect(RuntimeException.class);
-        exceptionRule.expectMessage(containsString("Timeout exceeded when trying to activate 'test1.testapp'"));
+        exceptionRule.expectMessage("Timeout exceeded when trying to activate 'test1.testapp'");
         applicationRepository.activate(applicationRepository.getTenant(applicationId()), sessionId, new TimeoutBudget(clock, Duration.ofSeconds(0)), false);
 
         Session activeSession = applicationRepository.getActiveSession(applicationId());
@@ -610,7 +607,7 @@ public class ApplicationRepositoryTest {
 
         applicationRepository.prepare(sessionId2, prepareParams());
         exceptionRule.expect(ActivationConflictException.class);
-        exceptionRule.expectMessage(containsString("app:test1.testapp.default Cannot activate session 3 because the currently active session (4) has changed since session 3 was created (was 2 at creation time)"));
+        exceptionRule.expectMessage("app:test1.testapp.default Cannot activate session 3 because the currently active session (4) has changed since session 3 was created (was 2 at creation time)");
         applicationRepository.activate(applicationRepository.getTenant(applicationId()), sessionId2, timeoutBudget, false);
     }
 
@@ -620,11 +617,11 @@ public class ApplicationRepositoryTest {
         long sessionId = result.sessionId();
 
         exceptionRule.expect(IllegalArgumentException.class);
-        exceptionRule.expectMessage(containsString("Session is active: 2"));
+        exceptionRule.expectMessage("Session is active: 2");
         applicationRepository.prepare(sessionId, prepareParams());
 
         exceptionRule.expect(IllegalArgumentException.class);
-        exceptionRule.expectMessage(containsString("app:test1.testapp.default Session 2 is already active"));
+        exceptionRule.expectMessage("app:test1.testapp.default Session 2 is already active");
         applicationRepository.activate(applicationRepository.getTenant(applicationId()), sessionId, timeoutBudget, false);
     }
 
@@ -679,9 +676,8 @@ public class ApplicationRepositoryTest {
 
         assertTrue(requestHandler.hasApplication(applicationId(), Optional.of(vespaVersion)));
         assertNull(requestHandler.resolveApplicationId("doesnotexist"));
-        assertThat(requestHandler.resolveApplicationId("mytesthost"), Is.is(new ApplicationId.Builder()
-                                                                                  .tenant(tenant1)
-                                                                                  .applicationName("testapp").build())); // Host set in application package.
+        assertEquals(new ApplicationId.Builder().tenant(tenant1).applicationName("testapp").build(),
+                requestHandler.resolveApplicationId("mytesthost")); // Host set in application package.
     }
 
     @Test
@@ -698,7 +694,7 @@ public class ApplicationRepositoryTest {
 
         // TODO: Revisit this test, I cannot see that we create a model for version 3.2.1
         config = resolve(SimpletypesConfig.class, requestHandler, applicationId(), new Version(3, 2, 1));
-        assertThat(config.intval(), Is.is(1337));
+        assertEquals(1337, config.intval());
     }
 
     @Test
@@ -716,7 +712,7 @@ public class ApplicationRepositoryTest {
         applicationRepository.delete(applicationId());
 
         exceptionRule.expect(com.yahoo.vespa.config.server.NotFoundException.class);
-        exceptionRule.expectMessage(containsString("No such application id: test1.testapp"));
+        exceptionRule.expectMessage("No such application id: test1.testapp");
         resolve(SimpletypesConfig.class, requestHandler, applicationId(), vespaVersion);
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerDBTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerDBTest.java
index b51c30cb991..41289357fab 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerDBTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerDBTest.java
@@ -12,7 +12,7 @@ import java.io.File;
 import java.io.IOException;
 
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author Ulf Lilleengen
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
index 0e8c69327e2..659bc771ac7 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
@@ -26,12 +26,9 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -88,13 +85,13 @@ public class ModelContextImplTest {
         assertFalse(context.previousModel().isPresent());
         assertTrue(context.getFileRegistry() instanceof MockFileRegistry);
         assertTrue(context.configDefinitionRepo() instanceof StaticConfigDefinitionRepo);
-        assertThat(context.properties().applicationId(), is(ApplicationId.defaultId()));
+        assertEquals(ApplicationId.defaultId(), context.properties().applicationId());
         assertTrue(context.properties().configServerSpecs().isEmpty());
         assertTrue(context.properties().multitenant());
         assertNotNull(context.properties().zone());
         assertFalse(context.properties().hostedVespa());
-        assertThat(context.properties().endpoints(), equalTo(endpoints));
-        assertThat(context.properties().isFirstTimeDeployment(), equalTo(false));
+        assertEquals(endpoints, context.properties().endpoints());
+        assertFalse(context.properties().isFirstTimeDeployment());
 
         assertEquals(Optional.empty(), context.wantedDockerImageRepo());
         assertEquals(new Version(7), context.modelVespaVersion());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java
index 1eb44c633f6..6bb904a89fa 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java
@@ -16,8 +16,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -44,10 +43,10 @@ public class ModelFactoryRegistryTest {
             List<ModelFactory> randomOrder = Arrays.asList(a, b, c, d);
             Collections.shuffle(randomOrder);
             ModelFactoryRegistry registry = new ModelFactoryRegistry(randomOrder);
-            assertThat(registry.getFactory(versionA), is(a));
-            assertThat(registry.getFactory(versionB), is(b));
-            assertThat(registry.getFactory(versionC), is(c));
-            assertThat(registry.getFactory(versionD), is(d));
+            assertEquals(a, registry.getFactory(versionA));
+            assertEquals(b, registry.getFactory(versionB));
+            assertEquals(c, registry.getFactory(versionC));
+            assertEquals(d, registry.getFactory(versionD));
         }
     }
 
@@ -58,7 +57,7 @@ public class ModelFactoryRegistryTest {
         TestFactory c = new TestFactory(new Version(5, 48, 44));
         TestFactory d = new TestFactory(new Version(5, 18, 44));
         ModelFactoryRegistry registry = new ModelFactoryRegistry(Arrays.asList(a, b, c, d));
-        assertThat(registry.getFactories().size(), is(4));
+        assertEquals(4, registry.getFactories().size());
         assertTrue(registry.getFactories().contains(a));
         assertTrue(registry.getFactories().contains(b));
         assertTrue(registry.getFactories().contains(c));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
index 5016107c411..2c738e2d519 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
@@ -37,8 +37,7 @@ import java.util.Optional;
 
 import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER;
 import static com.yahoo.vespa.config.protocol.JRTClientConfigRequestV3.createWithParams;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -65,8 +64,8 @@ public class SuperModelControllerTest {
         LbServicesConfig.Builder lb = new LbServicesConfig.Builder();
         handler.getSuperModel().getConfig(lb);
         LbServicesConfig lbc = new LbServicesConfig(lb);
-        assertThat(lbc.tenants().size(), is(1));
-        assertThat(lbc.tenants("a").applications().size(), is(1));
+        assertEquals(1, lbc.tenants().size());
+        assertEquals(1, lbc.tenants("a").applications().size());
         Applications app = lbc.tenants("a").applications("foo:prod:default:default");
         assertTrue(app.hosts().size() > 0);
     }
@@ -105,10 +104,10 @@ public class SuperModelControllerTest {
         LbServicesConfig.Builder lb = new LbServicesConfig.Builder();
         han.getSuperModel().getConfig(lb);
         LbServicesConfig lbc = new LbServicesConfig(lb);
-        assertThat(lbc.tenants().size(), is(2));
-        assertThat(lbc.tenants("t1").applications().size(), is(2));
-        assertThat(lbc.tenants("t2").applications().size(), is(1));
-        assertThat(lbc.tenants("t2").applications("minetooadvancedapp:prod:default:default").hosts().size(), is(1));
+        assertEquals(2, lbc.tenants().size());
+        assertEquals(2, lbc.tenants("t1").applications().size());
+        assertEquals(1, lbc.tenants("t2").applications().size());
+        assertEquals(1, lbc.tenants("t2").applications("minetooadvancedapp:prod:default:default").hosts().size());
         assertQrServer(lbc.tenants("t2").applications("minetooadvancedapp:prod:default:default"));
     }
 
@@ -119,14 +118,14 @@ public class SuperModelControllerTest {
     private void assertQrServer(Applications app) {
         String host = app.hosts().keySet().iterator().next();
         Applications.Hosts hosts = app.hosts(host);
-        assertThat(hosts.hostname(), is(host));
+        assertEquals(host, hosts.hostname());
         for (Map.Entry<String, Applications.Hosts.Services> e : app.hosts(host).services().entrySet()) {
             if (QRSERVER.serviceName.equals(e.getKey())) {
                 Applications.Hosts.Services s = e.getValue();
-                assertThat(s.type(), is("qrserver"));
-                assertThat(s.ports().size(), is(4));
-                assertThat(s.ports().get(0).number(), is(8000));
-                assertThat(s.index(), is(0));
+                assertEquals("qrserver", s.type());
+                assertEquals(4, s.ports().size());
+                assertEquals(8000, s.ports().get(0).number());
+                assertEquals(0, s.index());
                 return;
             }
         }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java
index a390d6793b4..3f329894cef 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java
@@ -22,13 +22,12 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -61,13 +60,13 @@ public class SuperModelRequestHandlerTest {
         long gen = counter.get();
         controller.reloadConfig(createApp(foo, 3L));
         assertNotNull(controller.getHandler());
-        assertThat(controller.getHandler().getGeneration(), is(gen + 1));
+        assertEquals(gen + 1, controller.getHandler().getGeneration());
         controller.reloadConfig(createApp(foo, 4L));
-        assertThat(controller.getHandler().getGeneration(), is(gen + 2));
+        assertEquals(gen + 2, controller.getHandler().getGeneration());
         // Test that a new app is used when there already exist an application with the same id
-        assertThat(controller.getHandler().getSuperModel().applicationModels().get(foo).getGeneration(), is(4L));
+        assertEquals(4, controller.getHandler().getSuperModel().applicationModels().get(foo).getGeneration());
         controller.reloadConfig(createApp(bar, 2L));
-        assertThat(controller.getHandler().getGeneration(), is(gen + 3));
+        assertEquals(gen + 3, controller.getHandler().getGeneration());
     }
 
     @Test
@@ -80,17 +79,17 @@ public class SuperModelRequestHandlerTest {
         controller.reloadConfig(createApp(foo, 3L));
         controller.reloadConfig(createApp(bar, 30L));
         controller.reloadConfig(createApp(baz, 9L));
-        assertThat(controller.getHandler().getGeneration(), is(gen + 3));
-        assertThat(controller.getHandler().getSuperModel().applicationModels().size(), is(3));
-        assertEquals(Arrays.asList(foo, bar, baz), new ArrayList<>(controller.getHandler().getSuperModel().applicationModels().keySet()));
+        assertEquals(gen + 3, controller.getHandler().getGeneration());
+        assertEquals(3, controller.getHandler().getSuperModel().applicationModels().size());
+        assertTrue(controller.getHandler().getSuperModel().applicationModels().keySet().containsAll(List.of(foo, bar, baz)));
         controller.removeApplication(new ApplicationId.Builder().tenant("a").applicationName("unknown").build());
-        assertThat(controller.getHandler().getGeneration(), is(gen + 4));
-        assertThat(controller.getHandler().getSuperModel().applicationModels().size(), is(3));
-        assertEquals(Arrays.asList(foo, bar, baz), new ArrayList<>(controller.getHandler().getSuperModel().applicationModels().keySet()));
+        assertEquals(gen + 4, controller.getHandler().getGeneration());
+        assertEquals(3, controller.getHandler().getSuperModel().applicationModels().size());
+        assertTrue(controller.getHandler().getSuperModel().applicationModels().keySet().containsAll(List.of(foo, bar, baz)));
         controller.removeApplication(bar);
-        assertThat(controller.getHandler().getSuperModel().applicationModels().size(), is(2));
+        assertEquals(2, controller.getHandler().getSuperModel().applicationModels().size());
         assertEquals(Arrays.asList(foo, baz), new ArrayList<>(controller.getHandler().getSuperModel().applicationModels().keySet()));
-        assertThat(controller.getHandler().getGeneration(), is(gen + 5));
+        assertEquals(gen + 5, controller.getHandler().getGeneration());
     }
 
     @Test
@@ -103,7 +102,7 @@ public class SuperModelRequestHandlerTest {
 
         long gen = counter.get();
         controller.reloadConfig(createApp(foo, 3L));
-        assertThat(controller.getHandler().getGeneration(), is(masterGen + gen + 1));
+        assertEquals(masterGen + gen + 1, controller.getHandler().getGeneration());
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/TimeoutBudgetTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/TimeoutBudgetTest.java
index e93d7113d99..e7666dff7f6 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/TimeoutBudgetTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/TimeoutBudgetTest.java
@@ -8,7 +8,7 @@ import java.time.Duration;
 import java.time.Instant;
 
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author Ulf Lilleengen
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java
index 92af4a75e51..0acdab7aec4 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java
@@ -41,10 +41,9 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -59,12 +58,12 @@ public class ApplicationTest {
         ServerCache cache = new ServerCache();
         Version vespaVersion = new Version(1, 2, 3);
         Application app = new Application(new ModelStub(), cache, 1337L, vespaVersion, MetricUpdater.createTestUpdater(), appId);
-        assertThat(app.getApplicationGeneration(), is(1337L));
+        assertEquals(1337L, app.getApplicationGeneration().longValue());
         assertNotNull(app.getModel());
-        assertThat(app.getCache(), is(cache));
-        assertThat(app.getId().application().value(), is("foobar"));
-        assertThat(app.getVespaVersion(), is(vespaVersion));
-        assertThat(app.toString(), is("application 'foobar', generation 1337, vespa version 1.2.3"));
+        assertEquals(cache, app.getCache());
+        assertEquals("foobar", app.getId().application().value());
+        assertEquals(vespaVersion, app.getVespaVersion());
+        assertEquals("application 'foobar', generation 1337, vespa version 1.2.3", app.toString());
     }
 
     private static final String[] emptySchema = new String[0];
@@ -145,7 +144,7 @@ public class ApplicationTest {
         assertNotNull(response);
         ConfigResponse cached_response = handler.resolveConfig(createRequest(ModelConfig.CONFIG_DEF_NAME, ModelConfig.CONFIG_DEF_NAMESPACE, ModelConfig.CONFIG_DEF_SCHEMA));
         assertNotNull(cached_response);
-        assertTrue(response == cached_response);
+        assertSame(response, cached_response);
     }
 
     private static GetConfigRequest createRequest(String name, String namespace, String[] schema) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
index d5eebb4d617..23444ac53d6 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.application;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteStreams;
 import org.apache.commons.compress.archivers.ArchiveOutputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
@@ -19,10 +18,8 @@ import java.util.List;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -60,8 +57,8 @@ public class CompressedApplicationInputStreamTest {
     private void assertTestApp(File outApp) {
         String [] files = outApp.list();
         assertNotNull(files);
-        assertThat(files.length, is(3));
-        assertThat(Arrays.asList(files), containsInAnyOrder(ImmutableList.of(is("hosts.xml"), is("services.xml"), is("deployment.xml"))));
+        assertEquals(3, files.length);
+        assertTrue(List.of(files).containsAll(List.of("hosts.xml", "services.xml", "deployment.xml")));
     }
 
     @Test
@@ -96,7 +93,7 @@ public class CompressedApplicationInputStreamTest {
 
         CompressedApplicationInputStream unpacked = CompressedApplicationInputStream.createFromCompressedStream(new TarArchiveInputStream(new GZIPInputStream(new FileInputStream(outFile))));
         File outApp = unpacked.decompress();
-        assertThat(outApp.getName(), is("application")); // gets the name of the subdir
+        assertEquals("application", outApp.getName()); // gets the name of the subdir
         assertTestApp(outApp);
     }
 
@@ -137,7 +134,7 @@ public class CompressedApplicationInputStreamTest {
                 new TarArchiveInputStream(new GZIPInputStream(new FileInputStream(gzFile))));
         File outApp = unpacked.decompress();
         List<File> files = Arrays.asList(outApp.listFiles());
-        assertThat(files.size(), is(5));
+        assertEquals(5, files.size());
         assertTrue(files.contains(new File(outApp, "services.xml")));
         assertTrue(files.contains(new File(outApp, "hosts.xml")));
         assertTrue(files.contains(new File(outApp, "deployment.xml")));
@@ -145,26 +142,26 @@ public class CompressedApplicationInputStreamTest {
         assertTrue(files.contains(new File(outApp, "external")));
         File sd = files.get(files.indexOf(new File(outApp, "schemas")));
         assertTrue(sd.isDirectory());
-        assertThat(sd.listFiles().length, is(1));
-        assertThat(sd.listFiles()[0].getAbsolutePath(), is(new File(sd, "keyvalue.sd").getAbsolutePath()));
+        assertEquals(1, sd.listFiles().length);
+        assertEquals(new File(sd, "keyvalue.sd").getAbsolutePath(), sd.listFiles()[0].getAbsolutePath());
 
         File ext = files.get(files.indexOf(new File(outApp, "external")));
         assertTrue(ext.isDirectory());
-        assertThat(ext.listFiles().length, is(1));
-        assertThat(ext.listFiles()[0].getAbsolutePath(), is(new File(ext, "foo").getAbsolutePath()));
+        assertEquals(1, ext.listFiles().length);
+        assertEquals(new File(ext, "foo").getAbsolutePath(), ext.listFiles()[0].getAbsolutePath());
 
         files = Arrays.asList(ext.listFiles());
         File foo = files.get(files.indexOf(new File(ext, "foo")));
         assertTrue(foo.isDirectory());
-        assertThat(foo.listFiles().length, is(1));
-        assertThat(foo.listFiles()[0].getAbsolutePath(), is(new File(foo, "bar").getAbsolutePath()));
+        assertEquals(1, foo.listFiles().length);
+        assertEquals(new File(foo, "bar").getAbsolutePath(), foo.listFiles()[0].getAbsolutePath());
 
         files = Arrays.asList(foo.listFiles());
         File bar = files.get(files.indexOf(new File(foo, "bar")));
         assertTrue(bar.isDirectory());
-        assertThat(bar.listFiles().length, is(1));
+        assertEquals(1, bar.listFiles().length);
         assertTrue(bar.listFiles()[0].isFile());
-        assertThat(bar.listFiles()[0].getAbsolutePath(), is(new File(bar, "lol").getAbsolutePath()));
+        assertEquals(new File(bar, "lol").getAbsolutePath(), bar.listFiles()[0].getAbsolutePath());
     }
 
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
index 02cc2e603d6..5afcd62a25c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
@@ -50,11 +50,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.IntStream;
 
 import static com.yahoo.vespa.config.server.application.TenantApplications.RemoveApplicationWaiter;
-import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -99,11 +97,11 @@ public class TenantApplicationsTest {
         writeApplicationData(createApplicationId("bar"), 4L);
         TenantApplications repo = createZKAppRepo();
         List<ApplicationId> applications = repo.activeApplications();
-        assertThat(applications.size(), is(2));
-        assertThat(applications.get(0).application().value(), is("bar"));
-        assertThat(applications.get(1).application().value(), is("foo"));
-        assertThat(repo.requireActiveSessionOf(applications.get(0)), is(4L));
-        assertThat(repo.requireActiveSessionOf(applications.get(1)), is(3L));
+        assertEquals(2, applications.size());
+        assertEquals("bar", applications.get(0).application().value());
+        assertEquals("foo", applications.get(1).application().value());
+        assertEquals(4, repo.requireActiveSessionOf(applications.get(0)));
+        assertEquals(3, repo.requireActiveSessionOf(applications.get(1)));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -130,10 +128,10 @@ public class TenantApplicationsTest {
         repo.createPutTransaction(myapp, 3).commit();
         String path = TenantRepository.getApplicationsPath(tenantName).append(myapp.serializedForm()).getAbsolute();
         assertNotNull(curatorFramework.checkExists().forPath(path));
-        assertThat(Utf8.toString(curatorFramework.getData().forPath(path)), is("3"));
+        assertEquals("3", Utf8.toString(curatorFramework.getData().forPath(path)));
         repo.createPutTransaction(myapp, 5).commit();
         assertNotNull(curatorFramework.checkExists().forPath(path));
-        assertThat(Utf8.toString(curatorFramework.getData().forPath(path)), is("5"));
+        assertEquals("5", Utf8.toString(curatorFramework.getData().forPath(path)));
     }
 
     @Test
@@ -145,11 +143,11 @@ public class TenantApplicationsTest {
         repo.createApplication(id2);
         repo.createPutTransaction(id1, 1).commit();
         repo.createPutTransaction(id2, 1).commit();
-        assertThat(repo.activeApplications().size(), is(2));
+        assertEquals(2, repo.activeApplications().size());
         repo.createDeleteTransaction(id1).commit();
-        assertThat(repo.activeApplications().size(), is(1));
+        assertEquals(1, repo.activeApplications().size());
         repo.createDeleteTransaction(id2).commit();
-        assertThat(repo.activeApplications().size(), is(0));
+        assertEquals(0, repo.activeApplications().size());
     }
 
     public static class MockReloadListener implements ReloadListener {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java
index f54fb272ed8..e72da13aee6 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java
@@ -8,7 +8,7 @@ import org.junit.Test;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static com.yahoo.vespa.config.server.configchange.Utils.*;
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsFormatterTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsFormatterTest.java
index c18035589f2..783f1e19df0 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsFormatterTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsFormatterTest.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.config.server.configchange;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static com.yahoo.vespa.config.server.configchange.Utils.*;
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsTest.java
index 31ccd2b8f84..6d5646c79e0 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsTest.java
@@ -9,7 +9,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static com.yahoo.vespa.config.server.configchange.Utils.*;
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
index 016041cb032..41ac081f68b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
@@ -36,9 +36,7 @@ import static com.yahoo.vespa.config.server.zookeeper.ZKApplication.DEFCONFIGS_Z
 import static com.yahoo.vespa.config.server.zookeeper.ZKApplication.META_ZK_PATH;
 import static com.yahoo.vespa.config.server.zookeeper.ZKApplication.USERAPP_ZK_SUBPATH;
 import static com.yahoo.vespa.config.server.zookeeper.ZKApplication.USER_DEFCONFIGS_ZK_SUBPATH;
-import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -92,11 +90,11 @@ public class ZooKeeperClientTest {
         ZooKeeperClient zooKeeperClient = new ZooKeeperClient(zk, logger, Path.fromString("/1"));
         zooKeeperClient.initialize();
         Path appPath = Path.fromString("/");
-        assertThat(zk.getChildren(appPath).size(), is(1));
+        assertEquals(1, zk.getChildren(appPath).size());
         Path currentAppPath = appPath.append(String.valueOf(generation));
         assertTrue(zk.exists(currentAppPath));
         assertTrue(zk.exists(currentAppPath.append(DEFCONFIGS_ZK_SUBPATH.replaceFirst("/", ""))));
-        assertThat(zk.getChildren(currentAppPath).size(), is(4));
+        assertEquals(4, zk.getChildren(currentAppPath).size());
     }
 
     @Test
@@ -106,14 +104,14 @@ public class ZooKeeperClientTest {
         List<String> children = zk.getChildren(defsPath);
         assertEquals(defsPath + " children", 1, children.size());
         Collections.sort(children);
-        assertThat(children.get(0), is("a.b.test2"));
+        assertEquals("a.b.test2", children.get(0));
 
         assertTrue(zk.exists(appPath.append(USER_DEFCONFIGS_ZK_SUBPATH.replaceFirst("/", ""))));
         Path userDefsPath = appPath.append(USER_DEFCONFIGS_ZK_SUBPATH);
         children = zk.getChildren(userDefsPath);
-        assertThat(children.size(), is(1));
+        assertEquals(1, children.size());
         Collections.sort(children);
-        assertThat(children.get(0), is("a.b.test2"));
+        assertEquals("a.b.test2", children.get(0));
     }
 
     @Test
@@ -123,11 +121,11 @@ public class ZooKeeperClientTest {
                 Utf8.toString(zk.getData(appPath.append(META_ZK_PATH)).get()));
         assertTrue(metaData.getChecksum().length() > 0);
         assertTrue(metaData.isInternalRedeploy());
-        assertThat(metaData.getDeployedByUser(), is("foo"));
-        assertThat(metaData.getDeployPath(), is("/bar/baz"));
-        assertThat(metaData.getDeployTimestamp(), is(1345L));
-        assertThat(metaData.getGeneration(), is(3L));
-        assertThat(metaData.getPreviousActiveGeneration(), is(2L));
+        assertEquals("foo", metaData.getDeployedByUser());
+        assertEquals("/bar/baz", metaData.getDeployPath());
+        assertEquals(1345, metaData.getDeployTimestamp().longValue());
+        assertEquals(3, metaData.getGeneration().longValue());
+        assertEquals(2, metaData.getPreviousActiveGeneration());
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/host/HostRegistryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/host/HostRegistryTest.java
index f7d55a34e33..df00d28134f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/host/HostRegistryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/host/HostRegistryTest.java
@@ -8,11 +8,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
@@ -30,16 +29,16 @@ public class HostRegistryTest {
         assertGetKey(reg, "foo.com", foo);
         assertGetKey(reg, "bar.com", foo);
         assertGetKey(reg, "baz.com", foo);
-        assertThat(reg.getAllHosts().size(), is(3));
+        assertEquals(3, reg.getAllHosts().size());
         reg.update(foo, List.of("bar.com", "baz.com"));
         assertNull(reg.getKeyForHost("foo.com"));
         assertGetKey(reg, "bar.com", foo);
         assertGetKey(reg, "baz.com", foo);
 
-        assertThat(reg.getAllHosts().size(), is(2));
-        assertThat(reg.getAllHosts(), contains("bar.com", "baz.com"));
+        assertEquals(2, reg.getAllHosts().size());
+        assertTrue(reg.getAllHosts().containsAll(List.of("bar.com", "baz.com")));
         reg.removeHostsForKey(foo);
-        assertThat(reg.getAllHosts().size(), is(0));
+        assertTrue(reg.getAllHosts().isEmpty());
         assertNull(reg.getKeyForHost("foo.com"));
         assertNull(reg.getKeyForHost("bar.com"));
     }
@@ -67,7 +66,7 @@ public class HostRegistryTest {
         HostRegistry reg = new HostRegistry();
         reg.update(foo, List.of("foo.com", "bar.com"));
         reg.update(bar, List.of("baz.com", "quux.com"));
-        assertThat(reg.getAllHosts().size(), is(4));
+        assertEquals(4, reg.getAllHosts().size());
     }
 
     @Test
@@ -75,9 +74,9 @@ public class HostRegistryTest {
         HostRegistry reg = new HostRegistry();
         List<String> hosts = new ArrayList<>(List.of("foo.com", "bar.com", "baz.com"));
         reg.update(foo, hosts);
-        assertThat(reg.getHostsForKey(foo).size(), is(3));
+        assertEquals(3, reg.getHostsForKey(foo).size());
         hosts.remove(2);
-        assertThat(reg.getHostsForKey(foo).size(), is(3));
+        assertEquals(3, reg.getHostsForKey(foo).size());
     }
 
     @Test
@@ -85,14 +84,14 @@ public class HostRegistryTest {
         HostRegistry reg = new HostRegistry();
         reg.update(foo, List.of("foo.com", "bar.com", "baz.com"));
         Collection<String> hosts = reg.getAllHosts();
-        assertThat(hosts.size(), is(3));
+        assertEquals(3, hosts.size());
         reg.update(foo, List.of("foo.com"));
-        assertThat(hosts.size(), is(3));
+        assertEquals(3, hosts.size());
     }
 
     private void assertGetKey(HostRegistry reg, String host, ApplicationId expectedKey) {
         assertNotNull(reg.getKeyForHost(host));
-        assertThat(reg.getKeyForHost(host), is(expectedKey));
+        assertEquals(expectedKey, reg.getKeyForHost(host));
     }
 
 }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java
index 3c9940679b9..f77d7331dea 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java
@@ -14,9 +14,8 @@ import java.util.Collection;
 import static com.yahoo.jdisc.Response.Status.BAD_REQUEST;
 import static com.yahoo.jdisc.Response.Status.NOT_FOUND;
 import static com.yahoo.jdisc.Response.Status.OK;
-import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 
 public abstract class ContentHandlerTestBase extends SessionHandlerTest {
     protected String baseUrl = "http://foo:1337/application/v2/tenant/default/session/1/content/";
@@ -39,7 +38,7 @@ public abstract class ContentHandlerTestBase extends SessionHandlerTest {
     public void require_that_nonexistant_file_returns_not_found() {
         HttpResponse response = doRequest(HttpRequest.Method.GET, "/test2.txt");
         assertNotNull(response);
-        assertThat(response.getStatus(), is(NOT_FOUND));
+        assertEquals(NOT_FOUND, response.getStatus());
     }
 
     @Test
@@ -50,7 +49,7 @@ public abstract class ContentHandlerTestBase extends SessionHandlerTest {
     @Test
     public void require_that_illegal_return_property_fails() {
         HttpResponse response = doRequest(HttpRequest.Method.GET, "/test.txt?return=foo");
-        assertThat(response.getStatus(), is(BAD_REQUEST));
+        assertEquals(BAD_REQUEST, response.getStatus());
     }
 
     @Test
@@ -77,17 +76,17 @@ public abstract class ContentHandlerTestBase extends SessionHandlerTest {
         HttpResponse response = doRequest(HttpRequest.Method.GET, path);
         assertNotNull(response);
         final String renderedString = SessionHandlerTest.getRenderedString(response);
-        assertThat(renderedString, response.getStatus(), is(OK));
-        assertThat(renderedString, is(expectedContent));
-        assertThat(response.getContentType(), is(expectedContentType));
+        assertEquals(renderedString, OK, response.getStatus());
+        assertEquals(expectedContent, renderedString);
+        assertEquals(expectedContentType, response.getContentType());
     }
 
     protected void assertStatus(String path, String expectedContent) throws IOException {
         HttpResponse response = doRequest(HttpRequest.Method.GET, path);
         assertNotNull(response);
         final String renderedString = SessionHandlerTest.getRenderedString(response);
-        assertThat(renderedString, response.getStatus(), is(OK));
-        assertThat(renderedString, is(expectedContent));
+        assertEquals(renderedString, OK, response.getStatus());
+        assertEquals(expectedContent, renderedString);
     }
 
     protected abstract HttpResponse doRequest(HttpRequest.Method method, String path);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java
index f681dbbc152..69caf86729f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java
@@ -5,9 +5,9 @@ import com.yahoo.container.jdisc.HttpResponse;
 
 import java.io.IOException;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Base class for handler tests
@@ -27,14 +27,14 @@ public class HandlerTest {
         if (renderedString == null) {
             renderedString = "assert failed";
         }
-        assertThat(renderedString, response.getStatus(), is(statusCode));
+        assertEquals(renderedString, statusCode, response.getStatus());
         if (errorCode != null) {
-            assertThat(renderedString, containsString(errorCode.name()));
+            assertTrue(renderedString.contains(errorCode.name()));
         }
         if (contentType != null) {
-            assertThat(renderedString, response.getContentType(), is(contentType));
+            assertEquals(renderedString, contentType, response.getContentType());
         }
-        assertThat(renderedString, containsString(message));
+        assertTrue(renderedString.contains(message));
     }
 
     public static void assertHttpStatusCodeErrorCodeAndMessage(HttpResponse response, int statusCode, HttpErrorResponse.ErrorCode errorCode, String message) throws IOException {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigRequestTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigRequestTest.java
index 96a1c123da5..f1be638468e 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigRequestTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigRequestTest.java
@@ -6,11 +6,8 @@ import com.yahoo.vespa.config.ConfigKey;
 
 import org.junit.Test;
 
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
 import static com.yahoo.jdisc.http.HttpRequest.Method.GET;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -23,7 +20,7 @@ public class HttpConfigRequestTest {
 
         HttpConfigRequest request = HttpConfigRequest.createFromRequestV1(HttpRequest.createTestRequest("http://example.yahoo.com:8080/config/v1/" +
                 configKey.getNamespace() + "." + configKey.getName() + "/" + configKey.getConfigId(), GET));
-        assertThat(request.getConfigKey(), is(configKey));
+        assertEquals(configKey, request.getConfigKey());
         assertTrue(request.getDefContent().isEmpty());
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigResponseTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigResponseTest.java
index f81c3577298..452d05c85ec 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigResponseTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigResponseTest.java
@@ -10,8 +10,7 @@ import org.junit.Test;
 
 import java.io.IOException;
 
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Ulf Lilleengen
@@ -26,6 +25,6 @@ public class HttpConfigResponseTest {
                                                                               false,
                                                                               PayloadChecksums.from("", "595f44fec1e92a71d"));
         HttpConfigResponse response = HttpConfigResponse.createFromConfig(configResponse);
-        assertThat(SessionHandlerTest.getRenderedString(response), is("{\"boolval\":false,\"doubleval\":0.0,\"enumval\":\"VAL1\",\"intval\":0,\"longval\":0,\"stringval\":\"s\"}"));
+        assertEquals(SessionHandlerTest.getRenderedString(response), "{\"boolval\":false,\"doubleval\":0.0,\"enumval\":\"VAL1\",\"intval\":0,\"longval\":0,\"stringval\":\"s\"}");
     }
 }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpErrorResponseTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpErrorResponseTest.java
index 0023e4dc701..f5c430152f3 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpErrorResponseTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpErrorResponseTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 import java.io.IOException;
 
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import static com.yahoo.jdisc.http.HttpResponse.Status.*;
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java
index e055473a245..8f092ec9d54 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java
@@ -13,9 +13,7 @@ import java.io.IOException;
 import java.time.Duration;
 import java.util.Collections;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 /**
  * @author Ulf Lilleengen
@@ -27,12 +25,12 @@ public class HttpHandlerTest {
         final String message = "failed";
         HttpHandler httpHandler = new HttpTestHandler(new InvalidApplicationException(message));
         HttpResponse response = httpHandler.handle(HttpRequest.createTestRequest("foo", com.yahoo.jdisc.http.HttpRequest.Method.GET));
-        assertThat(response.getStatus(), is(Response.Status.BAD_REQUEST));
+        assertEquals(Response.Status.BAD_REQUEST, response.getStatus());
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         response.render(baos);
         Slime data = SlimeUtils.jsonToSlime(baos.toByteArray());
-        assertThat(data.get().field("error-code").asString(), is(HttpErrorResponse.ErrorCode.INVALID_APPLICATION_PACKAGE.name()));
-        assertThat(data.get().field("message").asString(), is(message));
+        assertEquals(HttpErrorResponse.ErrorCode.INVALID_APPLICATION_PACKAGE.name(), data.get().field("error-code").asString());
+        assertEquals(message, data.get().field("message").asString());
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
index 00135a0a11e..322a2b924bd 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
@@ -25,9 +25,8 @@ import org.junit.rules.TemporaryFolder;
 import java.io.File;
 import java.io.IOException;
 
-import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 
 /**
  * @author Ulf Lilleengen
@@ -108,13 +107,13 @@ public class ApplicationContentHandlerTest extends ContentHandlerTestBase {
         Tenant tenant1 = applicationRepository.getTenant(appId1);
         Session session = applicationRepository.getActiveLocalSession(tenant1, appId1);
         assertContent("/test.txt", "foo\n");
-        assertThat(session.getStatus(), is(Session.Status.ACTIVATE));
+        assertEquals(Session.Status.ACTIVATE, session.getStatus());
     }
 
     private void assertNotFound(HttpRequest request) {
         HttpResponse response = handler.handle(request);
         assertNotNull(response);
-        assertThat(response.getStatus(), is(Response.Status.NOT_FOUND));
+        assertEquals(Response.Status.NOT_FOUND, response.getStatus());
     }
 
     @Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java
index c59375a6085..3d207f9f64a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java
@@ -31,9 +31,7 @@ import java.util.Collections;
 import static com.yahoo.jdisc.Response.Status.BAD_REQUEST;
 import static com.yahoo.jdisc.Response.Status.NOT_FOUND;
 import static com.yahoo.jdisc.http.HttpRequest.Method.GET;
-import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -97,9 +95,9 @@ public class HttpGetConfigHandlerTest {
         String uriLongAppId = "http://foo.com:8080/config/v2/tenant/bill/application/sookie/environment/dev/region/bellefleur/instance/sam/foo.bar/myid";
         HttpRequest r = HttpRequest.createTestRequest(uriLongAppId, GET);
         HttpConfigRequest req = HttpConfigRequest.createFromRequestV2(r);
-        assertThat(req.getApplicationId().tenant().value(), is("bill"));
-        assertThat(req.getApplicationId().application().value(), is("sookie"));
-        assertThat(req.getApplicationId().instance().value(), is("sam"));
+        assertEquals("bill", req.getApplicationId().tenant().value());
+        assertEquals("sookie", req.getApplicationId().application().value());
+        assertEquals("sam", req.getApplicationId().instance().value());
     }
 
     @Test
@@ -107,9 +105,9 @@ public class HttpGetConfigHandlerTest {
         String uriShortAppId = "http://foo.com:8080/config/v2/tenant/jason/application/alcide/foo.bar/myid";
         HttpRequest r = HttpRequest.createTestRequest(uriShortAppId, GET);
         HttpConfigRequest req = HttpConfigRequest.createFromRequestV2(r);
-        assertThat(req.getApplicationId().tenant().value(), is("jason"));
-        assertThat(req.getApplicationId().application().value(), is("alcide"));
-        assertThat(req.getApplicationId().instance().value(), is("default"));
+        assertEquals("jason", req.getApplicationId().tenant().value());
+        assertEquals("alcide", req.getApplicationId().application().value());
+        assertEquals("default", req.getApplicationId().instance().value());
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
index 26346cd8ffe..e2ad65786a4 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
@@ -26,9 +26,8 @@ import static com.yahoo.jdisc.http.HttpRequest.Method.DELETE;
 import static com.yahoo.jdisc.http.HttpRequest.Method.GET;
 import static com.yahoo.jdisc.http.HttpRequest.Method.POST;
 import static com.yahoo.jdisc.http.HttpRequest.Method.PUT;
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Ulf Lilleengen
@@ -122,7 +121,7 @@ public class ListApplicationsHandlerTest {
     static void assertResponse(ListApplicationsHandler handler, String url, int expectedStatus, String expectedResponse, Method method) throws IOException {
         HttpResponse response = handler.handle(HttpRequest.createTestRequest(url, method));
         assertNotNull(response);
-        assertThat(response.getStatus(), is(expectedStatus));
-        assertThat(SessionHandlerTest.getRenderedString(response), is(expectedResponse));
+        assertEquals(expectedStatus, response.getStatus());
+        assertEquals(expectedResponse, SessionHandlerTest.getRenderedString(response));
     }
 }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
index cb0d2129112..c6f84c2d6ae 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
@@ -24,7 +24,6 @@ import com.yahoo.vespa.config.server.tenant.Tenant;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
 import com.yahoo.vespa.config.server.tenant.TestTenantRepository;
 import com.yahoo.vespa.model.VespaModelFactory;
-import org.hamcrest.core.Is;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -43,10 +42,7 @@ import static com.yahoo.jdisc.Response.Status.OK;
 import static com.yahoo.vespa.config.server.http.SessionHandlerTest.Cmd;
 import static com.yahoo.vespa.config.server.http.SessionHandlerTest.createTestRequest;
 import static com.yahoo.vespa.config.server.http.SessionHandlerTest.getRenderedString;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public class SessionActiveHandlerTest {
@@ -150,21 +146,21 @@ public class SessionActiveHandlerTest {
         activateRequest.invoke();
         HttpResponse actResponse = activateRequest.getActResponse();
         String message = getRenderedString(actResponse);
-        assertThat(message, actResponse.getStatus(), Is.is(OK));
+        assertEquals(message, OK, actResponse.getStatus());
         assertActivationMessageOK(activateRequest, message);
     }
 
     private void assertActivationMessageOK(ActivateRequest activateRequest, String message) throws IOException {
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         new JsonFormat(true).encode(byteArrayOutputStream, activateRequest.getMetaData().getSlime());
-        assertThat(message, containsString("\"tenant\":\"" + tenantName + "\",\"message\":\"Session " + activateRequest.getSessionId() + activatedMessage));
-        assertThat(message, containsString("/application/v2/tenant/" + tenantName +
+        assertTrue(message.contains("\"tenant\":\"" + tenantName + "\",\"message\":\"Session " + activateRequest.getSessionId() + activatedMessage));
+        assertTrue(message.contains("/application/v2/tenant/" + tenantName +
                 "/application/" + appName +
                 "/environment/" + "prod" +
                 "/region/" + "default" +
                 "/instance/" + "default"));
         assertTrue(provisioner.activated());
-        assertThat(provisioner.lastHosts().size(), is(1));
+        assertEquals(1, provisioner.lastHosts().size());
     }
 
     private SessionActiveHandler createHandler() {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java
index 7b14579d79c..f13ec6cd5c8 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java
@@ -31,9 +31,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.time.Clock;
 
-import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 
 /**
  * @author Ulf Lilleengen
@@ -92,14 +91,14 @@ public class SessionContentHandlerTest extends ContentHandlerTestBase {
     public void require_that_mkdir_with_body_is_illegal(){
         HttpResponse response = put("/foobio/", "foo");
         assertNotNull(response);
-        assertThat(response.getStatus(), is(Response.Status.BAD_REQUEST));
+        assertEquals(Response.Status.BAD_REQUEST, response.getStatus());
     }
 
     @Test
     public void require_that_nonexistent_session_returns_not_found() {
         HttpResponse response = doRequest(HttpRequest.Method.GET, "/test.txt", 9999);
         assertNotNull(response);
-        assertThat(response.getStatus(), is(Response.Status.NOT_FOUND));
+        assertEquals(Response.Status.NOT_FOUND, response.getStatus());
     }
 
     protected HttpResponse put(String path, String content) {
@@ -111,7 +110,7 @@ public class SessionContentHandlerTest extends ContentHandlerTestBase {
     public void require_that_file_write_without_body_is_illegal() {
         HttpResponse response = doRequest(HttpRequest.Method.PUT, "/foobio.txt");
         assertNotNull(response);
-        assertThat(response.getStatus(), is(Response.Status.BAD_REQUEST));
+        assertEquals(Response.Status.BAD_REQUEST, response.getStatus());
     }
 
     @Test
@@ -146,10 +145,9 @@ public class SessionContentHandlerTest extends ContentHandlerTestBase {
     private void assertWriteFile(String path, String content) throws IOException {
         HttpResponse response = put(path, content);
         assertNotNull(response);
-        assertThat(response.getStatus(), is(Response.Status.OK));
+        assertEquals(Response.Status.OK, response.getStatus());
         assertContent(path, content);
-        assertThat(SessionHandlerTest.getRenderedString(response),
-                   is("{\"prepared\":\"http://foo:1337" + pathPrefix + sessionId + "/prepared\"}"));
+        assertEquals("{\"prepared\":\"http://foo:1337" + pathPrefix + sessionId + "/prepared\"}", SessionHandlerTest.getRenderedString(response));
     }
 
     private void assertDeleteFile(int statusCode, String filePath) throws IOException {
@@ -159,16 +157,16 @@ public class SessionContentHandlerTest extends ContentHandlerTestBase {
     private void assertDeleteFile(int statusCode, String filePath, String expectedResponse) throws IOException {
         HttpResponse response = doRequest(HttpRequest.Method.DELETE, filePath);
         assertNotNull(response);
-        assertThat(response.getStatus(), is(statusCode));
-        assertThat(SessionHandlerTest.getRenderedString(response), is(expectedResponse));
+        assertEquals(statusCode, response.getStatus());
+        assertEquals(expectedResponse, SessionHandlerTest.getRenderedString(response));
     }
 
     private void assertMkdir(String path) throws IOException {
         HttpResponse response = doRequest(HttpRequest.Method.PUT, path);
         assertNotNull(response);
-        assertThat(response.getStatus(), is(Response.Status.OK));
-        assertThat(SessionHandlerTest.getRenderedString(response),
-                   is("{\"prepared\":\"http://foo:1337" + pathPrefix + sessionId + "/prepared\"}"));
+        assertEquals(Response.Status.OK, response.getStatus());
+        assertEquals("{\"prepared\":\"http://foo:1337" + pathPrefix + sessionId + "/prepared\"}",
+                SessionHandlerTest.getRenderedString(response));
     }
 
     protected HttpResponse doRequest(HttpRequest.Method method, String path) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
index fced32251ad..4cb69ce5d20 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
@@ -43,10 +43,8 @@ import static com.yahoo.jdisc.Response.Status.OK;
 import static com.yahoo.jdisc.http.HttpRequest.Method.GET;
 import static com.yahoo.jdisc.http.HttpRequest.Method.POST;
 import static com.yahoo.vespa.config.server.http.HandlerTest.assertHttpStatusCodeErrorCodeAndMessage;
-import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -128,11 +126,11 @@ public class SessionCreateHandlerTest extends SessionHandlerTest {
         Map<String, String> parameters = Collections.singletonMap("name", "foo");
         HttpResponse response = createHandler().handle(post(outFile, postHeaders, parameters));
         assertNotNull(response);
-        assertThat(response.getStatus(), is(OK));
-        assertThat(SessionHandlerTest.getRenderedString(response),
-                   is("{\"log\":[]" + tenantMessage + ",\"session-id\":\"2\",\"prepared\":\"http://" +
+        assertEquals(OK, response.getStatus());
+        assertEquals(SessionHandlerTest.getRenderedString(response),
+                   "{\"log\":[]" + tenantMessage + ",\"session-id\":\"2\",\"prepared\":\"http://" +
                               hostname + ":" + port + pathPrefix + "2/prepared\",\"content\":\"http://" +
-                              hostname + ":" + port + pathPrefix + "2/content/\",\"message\":\"Session 2" + createdMessage + "}"));
+                              hostname + ":" + port + pathPrefix + "2/content/\",\"message\":\"Session 2" + createdMessage + "}");
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
index 0afe742f345..3c762b7c2e5 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
@@ -42,12 +42,10 @@ import static com.yahoo.jdisc.Response.Status.METHOD_NOT_ALLOWED;
 import static com.yahoo.jdisc.Response.Status.NOT_FOUND;
 import static com.yahoo.jdisc.Response.Status.OK;
 import static com.yahoo.vespa.config.server.http.HandlerTest.assertHttpStatusCodeErrorCodeAndMessage;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author hmusum
@@ -128,7 +126,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
         HttpResponse response = request(HttpRequest.Method.PUT, sessionId);
         assertNotNull(response);
-        assertThat(response.getStatus(), is(OK));
+        assertEquals(OK, response.getStatus());
         assertResponseContains(response, "\"activate\":\"http://foo:1337" + pathPrefix + sessionId +
                                          "/active\",\"message\":\"Session " + sessionId + preparedMessage);
     }
@@ -137,8 +135,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
     public void require_debug() throws Exception {
         HttpResponse response = createHandler().handle(
                 createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, 9999L, "?debug=true"));
-        assertThat(response.getStatus(), is(NOT_FOUND));
-        assertThat(SessionHandlerTest.getRenderedString(response), containsString("NotFoundException"));
+        assertEquals(NOT_FOUND, response.getStatus());
+        assertTrue(SessionHandlerTest.getRenderedString(response).contains("NotFoundException"));
     }
 
     @Test
@@ -147,8 +145,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         HttpResponse response = createHandler().handle(
                 createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, sessionId, "?verbose=true"));
         System.out.println(getRenderedString(response));
-        assertThat(response.getStatus(), is(OK));
-        assertThat(getRenderedString(response), containsString("Created application "));
+        assertEquals(OK, response.getStatus());
+        assertTrue(getRenderedString(response).contains("Created application "));
     }
 
     @Test
@@ -191,7 +189,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
         HttpResponse response = request(HttpRequest.Method.PUT, sessionId);
         assertNotNull(response);
-        assertThat(response.getStatus(), is(OK));
+        assertEquals(OK, response.getStatus());
         assertResponseContains(response, tenantMessage);
     }
 
@@ -207,7 +205,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         pathPrefix = "/application/v2/tenant/" + defaultTenant + "/session/";
         HttpResponse response = request(HttpRequest.Method.PUT, sessionId);
         assertNotNull(response);
-        assertThat(SessionHandlerTest.getRenderedString(response), response.getStatus(), is(OK));
+        assertEquals(SessionHandlerTest.getRenderedString(response), OK, response.getStatus());
 
         String applicationName = "myapp";
         ApplicationId applicationId2 = ApplicationId.from(tenant.value(), applicationName, "default");
@@ -218,7 +216,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
                 "/prepared?applicationName=" + applicationName;
         response = handler.handle(SessionHandlerTest.createTestRequest(pathPrefix));
         assertNotNull(response);
-        assertThat(SessionHandlerTest.getRenderedString(response), response.getStatus(), is(OK));
+        assertEquals(SessionHandlerTest.getRenderedString(response), OK, response.getStatus());
 
         ApplicationId applicationId3 = ApplicationId.from(tenant.value(), applicationName, "quux");
         long sessionId3 = applicationRepository.createSession(applicationId3, timeoutBudget, app);
@@ -226,7 +224,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
                 "/prepared?applicationName=" + applicationName + "&instance=quux";
         response = handler.handle(SessionHandlerTest.createTestRequest(pathPrefix));
         assertNotNull(response);
-        assertThat(SessionHandlerTest.getRenderedString(response), response.getStatus(), is(OK));
+        assertEquals(SessionHandlerTest.getRenderedString(response), OK, response.getStatus());
     }
 
     @Test
@@ -256,8 +254,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         HttpResponse response = handler.handle(createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, sessionId));
         assertEquals(400, response.getStatus());
         Slime data = getData(response);
-        assertThat(data.get().field("error-code").asString(), is(HttpErrorResponse.ErrorCode.OUT_OF_CAPACITY.name()));
-        assertThat(data.get().field("message").asString(), is(exceptionMessage));
+        assertEquals(HttpErrorResponse.ErrorCode.OUT_OF_CAPACITY.name(), data.get().field("error-code").asString());
+        assertEquals(exceptionMessage, data.get().field("message").asString());
     }
 
     @Test
@@ -271,8 +269,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         HttpResponse response = handler.handle(createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, sessionId));
         assertEquals(500, response.getStatus());
         Slime data = getData(response);
-        assertThat(data.get().field("error-code").asString(), is(HttpErrorResponse.ErrorCode.INTERNAL_SERVER_ERROR.name()));
-        assertThat(data.get().field("message").asString(), is(exceptionMessage));
+        assertEquals(HttpErrorResponse.ErrorCode.INTERNAL_SERVER_ERROR.name(), data.get().field("error-code").asString());
+        assertEquals(exceptionMessage, data.get().field("message").asString());
     }
 
     @Test
@@ -286,8 +284,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         HttpResponse response = handler.handle(createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, sessionId));
         assertEquals(500, response.getStatus());
         Slime data = getData(response);
-        assertThat(data.get().field("error-code").asString(), is(HttpErrorResponse.ErrorCode.APPLICATION_LOCK_FAILURE.name()));
-        assertThat(data.get().field("message").asString(), is(exceptionMessage));
+        assertEquals(HttpErrorResponse.ErrorCode.APPLICATION_LOCK_FAILURE.name(), data.get().field("error-code").asString());
+        assertEquals(exceptionMessage, data.get().field("message").asString());
     }
 
     @Test
@@ -308,11 +306,11 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
     }
 
     private static void assertResponseContains(HttpResponse response, String string) throws IOException {
-        assertThat(SessionHandlerTest.getRenderedString(response), containsString(string));
+        assertTrue(SessionHandlerTest.getRenderedString(response).contains(string));
     }
 
     private static void assertResponseNotContains(HttpResponse response, String string) throws IOException {
-        assertThat(SessionHandlerTest.getRenderedString(response), not(containsString(string)));
+        assertFalse(SessionHandlerTest.getRenderedString(response).contains(string));
     }
 
     private SessionHandler createHandler() {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
index fb5fb27cd7a..402e2576591 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
@@ -44,14 +44,9 @@ import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpo
 import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpoints.Scope.Enum.global;
 import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpoints.Scope.Enum.zone;
 import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
 
@@ -101,12 +96,12 @@ public class LbServicesProducerTest {
         LbServicesConfig conf = getLbServicesConfig(Zone.defaultZone(), testModel);
         LbServicesConfig.Tenants.Applications.Hosts.Services services =
                 conf.tenants("foo").applications("foo:prod:default:default").hosts("foo.foo.yahoo.com").services(QRSERVER.serviceName);
-        assertThat(services.servicealiases().size(), is(1));
-        assertThat(services.endpointaliases().size(), is(2));
+        assertEquals(1, services.servicealiases().size());
+        assertEquals(2, services.endpointaliases().size());
 
-        assertThat(services.servicealiases(0), is("service1"));
-        assertThat(services.endpointaliases(0), is("foo1.bar1.com"));
-        assertThat(services.endpointaliases(1), is("foo2.bar2.com"));
+        assertEquals("service1", services.servicealiases(0));
+        assertEquals("foo1.bar1.com", services.endpointaliases(0));
+        assertEquals("foo2.bar2.com", services.endpointaliases(1));
     }
 
     @Test
@@ -164,30 +159,30 @@ public class LbServicesProducerTest {
                 .hosts("foo.foo.yahoo.com")
                 .services(QRSERVER.serviceName);
 
-        assertThat(services.servicealiases(), contains("service1"));
-        assertThat("Missing endpoints in list: " + services.endpointaliases(), services.endpointaliases(), containsInAnyOrder("foo1.bar1.com", "foo2.bar2.com", rotation1, rotation2));
+        assertTrue(services.servicealiases().contains("service1"));
+        assertTrue("Missing endpoints in list: " + services.endpointaliases(), services.endpointaliases().containsAll(List.of("foo1.bar1.com", "foo2.bar2.com", rotation1, rotation2)));
 
         List<Endpoints> endpointList = config.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").endpoints();
         // Expect 4 zone endpoints (2 suffixes), 2 global endpoints and 1 application endpoint
         assertEquals(7, endpointList.size());
         List<Endpoints> zoneEndpoints = endpointList.stream().filter(e -> e.scope() == zone).collect(Collectors.toList());
         assertEquals(4, zoneEndpoints.size());
-        assertThat(zoneEndpoints.stream()
+        assertTrue(zoneEndpoints.stream()
                            .filter(e -> e.routingMethod() == sharedLayer4)
-                           .map(Endpoints::dnsName).collect(Collectors.toList()),
-                   containsInAnyOrder("mydisc.foo.foo.endpoint1.suffix", "mydisc.foo.foo.endpoint2.suffix"));
+                           .map(Endpoints::dnsName).collect(Collectors.toList())
+                .containsAll(List.of("mydisc.foo.foo.endpoint1.suffix", "mydisc.foo.foo.endpoint2.suffix")));
         assertContainsEndpoint(zoneEndpoints, "mydisc.foo.foo.endpoint1.suffix", "mydisc", zone, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
         assertContainsEndpoint(zoneEndpoints, "mydisc.foo.foo.endpoint2.suffix", "mydisc", zone, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
 
         List<Endpoints> globalEndpoints = endpointList.stream().filter(e -> e.scope() == global).collect(Collectors.toList());
         assertEquals(2, globalEndpoints.size());
-        assertThat(globalEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()), containsInAnyOrder("rotation-1", "rotation-2"));
+        assertTrue(globalEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()).containsAll(List.of("rotation-1", "rotation-2")));
         assertContainsEndpoint(globalEndpoints, "rotation-1", "mydisc", global, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
         assertContainsEndpoint(globalEndpoints, "rotation-2", "mydisc", global, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
 
         List<Endpoints> applicationEndpoints = endpointList.stream().filter(e -> e.scope() == application).collect(Collectors.toList());
         assertEquals(1, applicationEndpoints.size());
-        assertThat(applicationEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()), containsInAnyOrder("app-endpoint"));
+        assertTrue(applicationEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()).contains("app-endpoint"));
         assertContainsEndpoint(applicationEndpoints, "app-endpoint", "mydisc", application, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
     }
 
@@ -199,8 +194,8 @@ public class LbServicesProducerTest {
         Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder());
         LbServicesConfig conf = getLbServicesConfig(Zone.defaultZone(), testModel);
         LbServicesConfig.Tenants.Applications.Hosts.Services services = conf.tenants("foo").applications("foo:prod:default:default").hosts("foo.foo.yahoo.com").services(QRSERVER.serviceName);
-        assertThat(services.servicealiases().size(), is(1));
-        assertThat(services.endpointaliases().size(), is(2));
+        assertEquals(1, services.servicealiases().size());
+        assertEquals(2, services.endpointaliases().size());
 
         // No config for tester application
         assertNull(getLbServicesConfig(Zone.defaultZone(), testModel)
@@ -209,7 +204,7 @@ public class LbServicesProducerTest {
     }
 
     private void assertContainsEndpoint(List<Endpoints> endpoints, String dnsName, String clusterId, Endpoints.Scope.Enum scope, Endpoints.RoutingMethod.Enum routingMethod, int weight, List<String> hosts) {
-        assertThat(endpoints, hasItem(new Endpoints.Builder()
+        assertTrue(endpoints.contains(new Endpoints.Builder()
                                               .dnsName(dnsName)
                                               .clusterId(clusterId)
                                               .scope(scope)
@@ -316,8 +311,8 @@ public class LbServicesProducerTest {
     private void assertConfig(LbServicesConfig expected, LbServicesConfig actual) {
         assertFalse(expected.toString().isEmpty());
         assertFalse(actual.toString().isEmpty());
-        assertThat(expected.toString(), is(actual.toString()));
-        assertThat(ConfigPayload.fromInstance(expected).toString(true), is(ConfigPayload.fromInstance(actual).toString(true)));
+        assertEquals(actual.toString(), expected.toString());
+        assertEquals(ConfigPayload.fromInstance(expected).toString(true), ConfigPayload.fromInstance(actual).toString(true));
     }
 
     private TestProperties getTestproperties(ApplicationId applicationId) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java
index 21e1c1f3448..04882fcfa26 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java
@@ -22,9 +22,8 @@ import java.util.List;
 import java.util.Optional;
 
 import static com.yahoo.vespa.config.protocol.JRTClientConfigRequestV3.createWithParams;
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -40,17 +39,17 @@ public class DelayedConfigResponseTest {
 
         MockRpcServer rpc = new MockRpcServer(13337, temporaryFolder.newFolder());
         DelayedConfigResponses responses = new DelayedConfigResponses(rpc, 1, false);
-        assertThat(responses.size(), is(0));
+        assertEquals(0, responses.size());
         JRTServerConfigRequest req = createRequest("foo", "myid", 3, 1000000, "bar");
         req.setDelayedResponse(true);
         GetConfigContext context = GetConfigContext.testContext(ApplicationId.defaultId());
         responses.delayResponse(req, context);
-        assertThat(responses.size(), is(0));
+        assertEquals(0, responses.size());
 
         req.setDelayedResponse(false);
         responses.delayResponse(req, context);
         responses.delayResponse(createRequest("foolio", "myid", 3, 100000, "bar"), context);
-        assertThat(responses.size(), is(2));
+        assertEquals(2, responses.size());
         assertTrue(req.isDelayedResponse());
         List<DelayedConfigResponses.DelayedConfigResponse> it = responses.allDelayedResponses();
         assertFalse(it.isEmpty());
@@ -62,21 +61,21 @@ public class DelayedConfigResponseTest {
         MockRpcServer rpc = new MockRpcServer(13337, temporaryFolder.newFolder());
         DelayedConfigResponses responses = new DelayedConfigResponses(rpc, 1, false);
         responses.delayResponse(createRequest("foolio", "myid", 3, 100000, "bar"), context);
-        assertThat(responses.size(), is(1));
+        assertEquals(1, responses.size());
         responses.allDelayedResponses().get(0).cancelAndRemove();
-        assertThat(responses.size(), is(0));
+        assertEquals(0, responses.size());
     }
 
     @Test
     public void testDelayedConfigResponse() throws IOException {
         MockRpcServer rpc = new MockRpcServer(13337, temporaryFolder.newFolder());
         DelayedConfigResponses responses = new DelayedConfigResponses(rpc, 1, false);
-        assertThat(responses.size(), is(0));
-        assertThat(responses.toString(), is("DelayedConfigResponses. Average Size=0"));
+        assertEquals(0, responses.size());
+        assertEquals("DelayedConfigResponses. Average Size=0", responses.toString());
         JRTServerConfigRequest req = createRequest("foo", "myid", 3, 100, "bar");
         responses.delayResponse(req, GetConfigContext.testContext(ApplicationId.defaultId()));
         rpc.waitUntilSet(Duration.ofSeconds(5));
-        assertThat(rpc.latestRequest, is(req));
+        assertEquals(req, rpc.latestRequest);
     }
 
     private JRTServerConfigRequest createRequest(String configName, String configId, long generation, long timeout, String namespace) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
index 1b8a7ca2ad6..7ad237e45ed 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
@@ -37,11 +37,9 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Optional;
 
-import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -74,7 +72,7 @@ public class RpcServerTest {
         JRTClientConfigRequest clientReq = createSimpleRequest();
         tester.performRequest(clientReq.getRequest());
         assertFalse(clientReq.validateResponse());
-        assertThat(clientReq.errorCode(), is(ErrorCode.APPLICATION_NOT_LOADED));
+        assertEquals(ErrorCode.APPLICATION_NOT_LOADED, clientReq.errorCode());
     }
 
     @Test
@@ -127,7 +125,7 @@ public class RpcServerTest {
         assertTrue(clientReq.validateParameters());
         tester.performRequest(clientReq.getRequest());
         assertFalse(clientReq.validateResponse());
-        assertThat(clientReq.errorCode(), is(ErrorCode.APPLICATION_NOT_LOADED));
+        assertEquals(ErrorCode.APPLICATION_NOT_LOADED, clientReq.errorCode());
 
         tester.rpcServer().onTenantsLoaded();
         clientReq = createRequest(new RawConfig(key, LbServicesConfig.getDefMd5()));
@@ -135,7 +133,7 @@ public class RpcServerTest {
         tester.performRequest(clientReq.getRequest());
         boolean validResponse = clientReq.validateResponse();
         assertTrue(clientReq.errorMessage(), validResponse);
-        assertThat(clientReq.errorCode(), is(0));
+        assertEquals(0, clientReq.errorCode());
     }
 
     private void testGetConfig(RpcTester tester) {
@@ -143,20 +141,20 @@ public class RpcServerTest {
         JRTClientConfigRequest req = createRequest(new RawConfig(key, SimpletypesConfig.getDefMd5()));
         assertTrue(req.validateParameters());
         tester.performRequest(req.getRequest());
-        assertThat(req.errorCode(), is(0));
+        assertEquals(0, req.errorCode());
         assertTrue(req.validateResponse());
         ConfigPayload payload = ConfigPayload.fromUtf8Array(req.getNewPayload().getData());
         assertNotNull(payload);
         SimpletypesConfig.Builder builder = new SimpletypesConfig.Builder();
         new ConfigPayloadApplier<>(builder).applyPayload(payload);
         SimpletypesConfig config = new SimpletypesConfig(builder);
-        assertThat(config.intval(), is(0));
+        assertEquals(0, config.intval());
     }
 
     private void testPrintStatistics(RpcTester tester) {
         Request req = new Request("printStatistics");
         tester.performRequest(req);
-        assertThat(req.returnValues().get(0).asString(), is("Delayed responses queue size: 0"));
+        assertEquals("Delayed responses queue size: 0", req.returnValues().get(0).asString());
     }
 
     private JRTClientConfigRequest createRequest(RawConfig config) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java
index e8749334448..40ed20b7969 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java
@@ -38,10 +38,8 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -163,7 +161,7 @@ public class RpcTester implements AutoCloseable {
         }
         assertFalse(req.isError());
         assertTrue(req.returnValues().size() > 0);
-        assertThat(req.returnValues().get(0).asInt32(), is(0));
+        assertEquals(0, req.returnValues().get(0).asInt32());
     }
 
     void performRequest(Request req) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java
index f34b59dbc9f..854abee91f5 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java
@@ -59,6 +59,7 @@ public class MultiTenantRpcAuthorizerTest {
     private static final HostName HOSTNAME = HostName.from("myhostname");
     private static final FileReference FILE_REFERENCE = new FileReference("myfilereference");
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException exceptionRule = ExpectedException.none();
 
@@ -269,7 +270,7 @@ public class MultiTenantRpcAuthorizerTest {
         request.setString("clientHostname", hostname);
         try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
             new JsonFormat(false).encode(out, data);
-            return new String(out.toByteArray());
+            return out.toString();
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
index cd824967fc3..46c31533598 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
@@ -2,55 +2,36 @@
 package com.yahoo.vespa.config.server.session;
 
 import com.yahoo.config.model.api.ApplicationClusterEndpoint;
-import com.yahoo.config.model.api.ApplicationRoles;
 import com.yahoo.config.model.api.ContainerEndpoint;
 import com.yahoo.config.model.api.EndpointCertificateMetadata;
 import com.yahoo.config.model.api.TenantSecretStore;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
-import com.yahoo.security.KeyAlgorithm;
-import com.yahoo.security.KeyUtils;
-import com.yahoo.security.SignatureAlgorithm;
-import com.yahoo.security.X509CertificateBuilder;
+
 import com.yahoo.security.X509CertificateUtils;
-import com.yahoo.security.X509CertificateWithKey;
-import com.yahoo.slime.ArrayInserter;
+
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Injector;
-import com.yahoo.slime.Inspector;
 import com.yahoo.slime.ObjectInserter;
-import com.yahoo.slime.ObjectSymbolInserter;
 import com.yahoo.slime.Slime;
-import com.yahoo.slime.SlimeInserter;
 import com.yahoo.slime.SlimeUtils;
 import com.yahoo.vespa.config.server.tenant.ContainerEndpointSerializer;
 import com.yahoo.vespa.config.server.tenant.EndpointCertificateMetadataSerializer;
 import com.yahoo.vespa.config.server.tenant.TenantSecretStoreSerializer;
 import org.junit.Test;
 
-import javax.security.auth.x500.X500Principal;
 import java.io.IOException;
-import java.math.BigInteger;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.security.KeyPair;
 import java.security.cert.X509Certificate;
 import java.time.Duration;
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.OptionalInt;
-import java.util.OptionalLong;
-import java.util.stream.Collectors;
+;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -79,13 +60,13 @@ public class PrepareParamsTest {
     public void testCorrectParsing() {
         PrepareParams prepareParams = createParams("http://foo:19071/application/v2/", TenantName.defaultName());
 
-        assertThat(prepareParams.getApplicationId(), is(ApplicationId.defaultId()));
+        assertEquals(ApplicationId.defaultId(), prepareParams.getApplicationId());
         assertFalse(prepareParams.isDryRun());
         assertFalse(prepareParams.isVerbose());
         assertFalse(prepareParams.ignoreValidationErrors());
-        assertThat(prepareParams.vespaVersion(), is(Optional.<String>empty()));
+        assertTrue(prepareParams.vespaVersion().isEmpty());
         assertTrue(prepareParams.getTimeoutBudget().hasTimeLeft());
-        assertThat(prepareParams.containerEndpoints().size(), is(0));
+        assertTrue(prepareParams.containerEndpoints().isEmpty());
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index 79632b8446b..72d7311ed9a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -69,10 +69,8 @@ import java.util.logging.Level;
 
 import static com.yahoo.vespa.config.server.session.SessionPreparer.PrepareResult;
 import static com.yahoo.vespa.config.server.session.SessionZooKeeperClient.APPLICATION_PACKAGE_REFERENCE_PATH;
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -97,6 +95,7 @@ public class SessionPreparerTest {
     @Rule
     public TemporaryFolder folder = new TemporaryFolder();
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
@@ -216,7 +215,7 @@ public class SessionPreparerTest {
         PrepareParams params = new PrepareParams.Builder().applicationId(applicationId()).build();
         int sessionId = 1;
         prepare(testApp, params);
-        assertThat(createSessionZooKeeperClient(sessionId).readApplicationId().get(), is(applicationId()));
+        assertEquals(applicationId(), createSessionZooKeeperClient(sessionId).readApplicationId().get());
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
index feae135a508..150df8e303f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
@@ -52,12 +52,10 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.LongPredicate;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -79,6 +77,7 @@ public class SessionRepositoryTest {
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
@@ -193,7 +192,7 @@ public class SessionRepositoryTest {
         expectedException.expectMessage("Could not load remote session " + sessionIdString);
         expectedException.expect(RuntimeException.class);
         sessionRepository.loadSessions(new InThreadExecutorService());
-        assertThat(sessionRepository.getRemoteSessionsFromZooKeeper().size(), is(0));
+        assertTrue(sessionRepository.getRemoteSessionsFromZooKeeper().isEmpty());
     }
 
     @Test(expected = InvalidApplicationException.class)
@@ -302,11 +301,6 @@ public class SessionRepositoryTest {
         assertRemoteSessionStatus(sessionId, status);
     }
 
-    private void assertSessionRemoved(long sessionId) {
-        waitFor(p -> sessionRepository.getRemoteSession(sessionId) == null, sessionId);
-        assertNull(sessionRepository.getRemoteSession(sessionId));
-    }
-
     private void assertRemoteSessionExists(long sessionId) {
         assertRemoteSessionStatus(sessionId, Session.Status.NEW);
     }
@@ -315,7 +309,7 @@ public class SessionRepositoryTest {
         waitFor(p -> sessionRepository.getRemoteSession(sessionId) != null &&
                      sessionRepository.getRemoteSession(sessionId).getStatus() == status, sessionId);
         assertNotNull(sessionRepository.getRemoteSession(sessionId));
-        assertThat(sessionRepository.getRemoteSession(sessionId).getStatus(), is(status));
+        assertEquals(status, sessionRepository.getRemoteSession(sessionId).getStatus());
     }
 
     private void waitFor(LongPredicate predicate, long sessionId) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java
index 814c99bd2fb..2f6e6a19651 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java
@@ -22,9 +22,7 @@ import java.util.List;
 import java.util.Optional;
 
 import static com.yahoo.vespa.config.server.zookeeper.ZKApplication.SESSIONSTATE_ZK_SUBPATH;
-import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -36,6 +34,7 @@ public class SessionZooKeeperClientTest {
 
     private Curator curator;
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
@@ -49,16 +48,16 @@ public class SessionZooKeeperClientTest {
     public void require_that_status_can_be_updated() {
         SessionZooKeeperClient zkc = createSessionZKClient(1);
         zkc.writeStatus(Session.Status.NEW);
-        assertThat(zkc.readStatus(), is(Session.Status.NEW));
+        assertEquals(Session.Status.NEW, zkc.readStatus());
 
         zkc.writeStatus(Session.Status.PREPARE);
-        assertThat(zkc.readStatus(), is(Session.Status.PREPARE));
+        assertEquals(Session.Status.PREPARE, zkc.readStatus());
 
         zkc.writeStatus(Session.Status.ACTIVATE);
-        assertThat(zkc.readStatus(), is(Session.Status.ACTIVATE));
+        assertEquals(Session.Status.ACTIVATE, zkc.readStatus());
 
         zkc.writeStatus(Session.Status.DEACTIVATE);
-        assertThat(zkc.readStatus(), is(Session.Status.DEACTIVATE));
+        assertEquals(Session.Status.DEACTIVATE, zkc.readStatus());
     }
 
     @Test
@@ -68,7 +67,7 @@ public class SessionZooKeeperClientTest {
         zkc.writeStatus(Session.Status.NEW);
         Path path = sessionPath(sessionId).append(SESSIONSTATE_ZK_SUBPATH);
         assertTrue(curator.exists(path));
-        assertThat(Utf8.toString(curator.getData(path).get()), is("NEW"));
+        assertEquals("NEW", Utf8.toString(curator.getData(path).get()));
     }
 
     @Test
@@ -76,7 +75,7 @@ public class SessionZooKeeperClientTest {
         int sessionId = 3;
         SessionZooKeeperClient zkc = createSessionZKClient(sessionId);
         curator.set(sessionPath(sessionId).append(SESSIONSTATE_ZK_SUBPATH), Utf8.toBytes("PREPARE"));
-        assertThat(zkc.readStatus(), is(Session.Status.PREPARE));
+        assertEquals(Session.Status.PREPARE, zkc.readStatus());
     }
 
     @Test
@@ -91,7 +90,7 @@ public class SessionZooKeeperClientTest {
         zkc.writeApplicationId(id);
         Path path = sessionPath(sessionId).append(SessionZooKeeperClient.APPLICATION_ID_PATH);
         assertTrue(curator.exists(path));
-        assertThat(Utf8.toString(curator.getData(path).get()), is(id.serializedForm()));
+        assertEquals(id.serializedForm(), Utf8.toString(curator.getData(path).get()));
     }
 
     @Test
@@ -125,11 +124,11 @@ public class SessionZooKeeperClientTest {
         int sessionId = 3;
         SessionZooKeeperClient zkc = createSessionZKClient(sessionId);
         curator.delete(sessionPath(sessionId));
-        assertThat(zkc.readCreateTime(), is(Instant.EPOCH));
+        assertEquals(Instant.EPOCH, zkc.readCreateTime());
         Instant now = Instant.now();
         zkc.createNewSession(now);
         // resolution is in seconds, so need to go back use that when comparing
-        assertThat(zkc.readCreateTime(), is(Instant.ofEpochSecond(now.getEpochSecond())));
+        assertEquals(Instant.ofEpochSecond(now.getEpochSecond()), zkc.readCreateTime());
     }
 
     @Test
@@ -137,7 +136,7 @@ public class SessionZooKeeperClientTest {
         final FileReference testRef = new FileReference("test-ref");
         SessionZooKeeperClient zkc = createSessionZKClient(3);
         zkc.writeApplicationPackageReference(Optional.of(testRef));
-        assertThat(zkc.readApplicationPackageReference(), is(testRef));
+        assertEquals(testRef, zkc.readApplicationPackageReference());
     }
 
     @Test
@@ -164,7 +163,7 @@ public class SessionZooKeeperClientTest {
         Path path = sessionPath(sessionId).append(SessionZooKeeperClient.APPLICATION_ID_PATH);
         curator.set(path, Utf8.toBytes(idString));
         ApplicationId applicationId = zkc.readApplicationId().get();
-        assertThat(applicationId.serializedForm(), is(expectedIdString));
+        assertEquals(expectedIdString, applicationId.serializedForm());
     }
 
     private SessionZooKeeperClient createSessionZKClient(long sessionId) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
index 4c99264c805..1a394bbb8cd 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
@@ -64,6 +64,7 @@ public class TenantRepositoryTest {
     private Curator curator;
     private ConfigserverConfig configserverConfig;
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java
index 52d45d9ff5c..a0bd0e1f130 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java
@@ -11,9 +11,8 @@ import org.junit.rules.TemporaryFolder;
 
 import java.io.IOException;
 
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 /**
  * @author Ulf Lilleengen
@@ -60,9 +59,9 @@ public class TenantTest {
 
     @Test
     public void hashcode() {
-        assertThat(t1.hashCode(), is(t2.hashCode()));
-        assertThat(t1.hashCode(), is(not(t3.hashCode())));
-        assertThat(t1.hashCode(), is(not(t4.hashCode())));
+        assertEquals(t1.hashCode(), t2.hashCode());
+        assertNotEquals(t1.hashCode(), t3.hashCode());
+        assertNotEquals(t1.hashCode(), t4.hashCode());
     }
 
 }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/version/VersionStateTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/version/VersionStateTest.java
index ccd330c0193..1f49d496f70 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/version/VersionStateTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/version/VersionStateTest.java
@@ -13,9 +13,8 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 
-import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -32,32 +31,32 @@ public class VersionStateTest {
         Version unknownVersion = new Version(0, 0, 0);
 
         VersionState state = createVersionState();
-        assertThat(state.storedVersion(), is(unknownVersion));
+        assertEquals(unknownVersion, state.storedVersion());
         assertTrue(state.isUpgraded());
         state.saveNewVersion();
         assertFalse(state.isUpgraded());
 
         state.saveNewVersion("badversion");
-        assertThat(state.storedVersion(), is(unknownVersion));
+        assertEquals(unknownVersion, state.storedVersion());
         assertTrue(state.isUpgraded());
 
         state.saveNewVersion("5.0.0");
-        assertThat(state.storedVersion(), is(new Version(5, 0, 0)));
+        assertEquals(new Version(5, 0, 0), state.storedVersion());
         assertTrue(state.isUpgraded());
 
         // Remove zk node, should find version in ZooKeeper
         curator.delete(VersionState.versionPath);
-        assertThat(state.storedVersion(), is(new Version(5, 0, 0)));
+        assertEquals(new Version(5, 0, 0), state.storedVersion());
         assertTrue(state.isUpgraded());
 
         // Save new version, remove version in file, should find version in ZooKeeper
         state.saveNewVersion("6.0.0");
         Files.delete(state.versionFile().toPath());
-        assertThat(state.storedVersion(), is(new Version(6, 0, 0)));
+        assertEquals(new Version(6, 0, 0), state.storedVersion());
         assertTrue(state.isUpgraded());
 
         state.saveNewVersion();
-        assertThat(state.currentVersion(), is(state.storedVersion()));
+        assertEquals(state.currentVersion(), state.storedVersion());
         assertFalse(state.isUpgraded());
     }
 
@@ -69,7 +68,7 @@ public class VersionStateTest {
         File versionFile = new File(dbDir, "vespa_version");
         assertTrue(versionFile.exists());
         Version stored = Version.fromString(IOUtils.readFile(versionFile));
-        assertThat(stored, is(state.currentVersion()));
+        assertEquals(stored, state.currentVersion());
     }
 
     private VersionState createVersionState() throws IOException {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounterTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounterTest.java
index d2c29a7577f..5c87f5bfc52 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounterTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounterTest.java
@@ -6,8 +6,7 @@ import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Ulf Lilleengen
@@ -22,7 +21,7 @@ public class InitializedCounterTest {
         curator.create(Path.fromString("/sessions/2"));
 
         InitializedCounter counter = new InitializedCounter(curator, Path.fromString("/counter"), Path.fromString("/sessions"));
-        assertThat(counter.counter.get(), is(2L));
+        assertEquals(2, counter.counter.get());
     }
 
 }