2 files changed, 6 insertions, 7 deletions
diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/services/ServerSetupQueryTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/services/ServerSetupQueryTest.java
index 94a18f4ff44..e7f899a06c7 100644
--- a/sonar-ws-client/src/test/java/org/sonar/wsclient/services/ServerSetupQueryTest.java
+++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/services/ServerSetupQueryTest.java
@@ -19,16 +19,15 @@
  */
 package org.sonar.wsclient.services;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
 import org.junit.Test;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 public class ServerSetupQueryTest extends QueryTestCase {
   @Test
   public void index() {
     ServerSetupQuery query = new ServerSetupQuery();
-    assertThat(query.getUrl(), is("/api/server/setup"));
-    assertThat(query.getModelClass().getName(), is(ServerSetup.class.getName()));
+    assertThat(query.getUrl()).isEqualTo("/api/server/setup");
+    assertThat(query.getModelClass().getName()).isEqualTo(ServerSetup.class.getName());
   }
 }
diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ResourceUnmarshallerTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ResourceUnmarshallerTest.java
index 551a0597fd8..4fac008d1a0 100644
--- a/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ResourceUnmarshallerTest.java
+++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ResourceUnmarshallerTest.java
@@ -24,9 +24,9 @@ import org.sonar.wsclient.services.Resource;
 
 import java.util.List;
 
-import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNot.not;
 import static org.junit.Assert.assertThat;
 
 public class ResourceUnmarshallerTest extends UnmarshallerTestCase {