diff --git a/.classpath b/.classpath
index 65b3c9d1c6..5bc02409a8 100644
--- a/.classpath
+++ b/.classpath
@@ -10,11 +10,9 @@
 	<classpathentry kind="lib" path="libs/groovy.jar"/>
 	<classpathentry kind="lib" path="libs/guava.jar"/>
 	<classpathentry kind="lib" path="libs/h2.jar"/>
-	<classpathentry kind="lib" path="libs/hamcrest-all-1.1.jar"/>
 	<classpathentry kind="lib" path="libs/jardiff.jar"/>
 	<classpathentry kind="lib" path="libs/jcurses.jar"/>
 	<classpathentry kind="lib" path="libs/jorbis.jar"/>
-	<classpathentry kind="lib" path="libs/junit-4.4.jar"/>
 	<classpathentry kind="lib" path="libs/libtiled.jar"/>
 	<classpathentry kind="lib" path="libs/log4j.jar"/>
 	<classpathentry kind="lib" path="libs/marauroa.jar" sourcepath="/marauroa"/>
@@ -38,5 +36,7 @@
 	<classpathentry kind="lib" path="libs/websocket-common-9.2.5.v20141112.jar"/>
 	<classpathentry kind="lib" path="libs/websocket-server-9.2.5.v20141112.jar"/>
 	<classpathentry kind="lib" path="libs/websocket-servlet-9.2.5.v20141112.jar"/>
+	<classpathentry kind="lib" path="libs/junit-4.12.jar"/>
+	<classpathentry kind="lib" path="libs/java-hamcrest-2.0.0.0.jar" sourcepath="/home/brummermann/.m2/repository/org/hamcrest/java-hamcrest/2.0.0.0/java-hamcrest-2.0.0.0-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build.ant.properties b/build.ant.properties
index d22505cd7a..e69b84e648 100644
--- a/build.ant.properties
+++ b/build.ant.properties
@@ -22,10 +22,10 @@ guava_jar  = ${libdir}/guava.jar
 log4j_jar    = ${libdir}/log4j.jar
 
 #hamcrest Matchers
-hamcrest_jar =${libdir}/hamcrest-all-1.1.jar
+hamcrest_jar =${libdir}/java-hamcrest-2.0.0.0.jar
 
 # Junit 4.
-junit_jar    = ${libdir}/junit-4.4.jar
+junit_jar    = ${libdir}/junit-4.12.jar
 
 # Groovy. You perhaps can save this one.
 # It was used on the past but we agreed to remove support for groovy.
diff --git a/libs/hamcrest-all-1.1.jar b/libs/hamcrest-all-1.1.jar
deleted file mode 100644
index 0399764dd7..0000000000
Binary files a/libs/hamcrest-all-1.1.jar and /dev/null differ
diff --git a/libs/java-hamcrest-2.0.0.0.jar b/libs/java-hamcrest-2.0.0.0.jar
new file mode 100644
index 0000000000..7310af1b3a
Binary files /dev/null and b/libs/java-hamcrest-2.0.0.0.jar differ
diff --git a/libs/junit-4.12.jar b/libs/junit-4.12.jar
new file mode 100644
index 0000000000..3a7fc266c3
Binary files /dev/null and b/libs/junit-4.12.jar differ
diff --git a/libs/junit-4.4.jar b/libs/junit-4.4.jar
deleted file mode 100644
index 649b0b327f..0000000000
Binary files a/libs/junit-4.4.jar and /dev/null differ
diff --git a/tests/games/stendhal/client/actions/SlashActionRepositoryTest.java b/tests/games/stendhal/client/actions/SlashActionRepositoryTest.java
index 50fde862e6..20646d6d51 100644
--- a/tests/games/stendhal/client/actions/SlashActionRepositoryTest.java
+++ b/tests/games/stendhal/client/actions/SlashActionRepositoryTest.java
@@ -1,6 +1,5 @@
-/* $Id$ */
 /***************************************************************************
- *                   (C) Copyright 2003-2010 - Stendhal                    *
+ *                   (C) Copyright 2003-2015 - Stendhal                    *
  ***************************************************************************
  ***************************************************************************
  *                                                                         *
@@ -12,8 +11,8 @@
  ***************************************************************************/
 package games.stendhal.client.actions;
 
-import static org.junit.Assert.*;
-import static org.junit.matchers.StringContains.containsString;
+import static org.hamcrest.core.StringContains.containsString;
+import static org.junit.Assert.assertThat;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/tests/games/stendhal/server/events/TextEventTest.java b/tests/games/stendhal/server/events/TextEventTest.java
index 08340afdb9..ed95ecf6c7 100644
--- a/tests/games/stendhal/server/events/TextEventTest.java
+++ b/tests/games/stendhal/server/events/TextEventTest.java
@@ -12,16 +12,15 @@
  ***************************************************************************/
 package games.stendhal.server.events;
 
-import marauroa.common.game.RPClass;
-
-import org.junit.Test;
-
 import static org.hamcrest.CoreMatchers.is;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
+import marauroa.common.game.RPClass;
+
 public class TextEventTest {
 
 	/**
@@ -30,7 +29,6 @@ public class TextEventTest {
 	@Test
 	public void testTextEvent() {
 		TextEvent event = new TextEvent("text");
-		assertThat(event, is(TextEvent.class));
 		assertThat(event.get("text"), is("text"));
 	}
 
@@ -42,7 +40,7 @@ public class TextEventTest {
 		TextEvent.generateRPClass();
 		assertTrue(RPClass.hasRPClass("text"));
 	}
-	
-	
+
+
 
 }
diff --git a/tests/games/stendhal/server/maps/quests/FindGhostsTest.java b/tests/games/stendhal/server/maps/quests/FindGhostsTest.java
index 28f0b87a3a..8c84e1bc38 100644
--- a/tests/games/stendhal/server/maps/quests/FindGhostsTest.java
+++ b/tests/games/stendhal/server/maps/quests/FindGhostsTest.java
@@ -13,14 +13,18 @@
 package games.stendhal.server.maps.quests;
 
 import static junit.framework.Assert.assertTrue;
-import static utilities.SpeakerNPCTestHelper.getReply;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
-import static org.junit.matchers.StringContains.containsString;
+import static utilities.SpeakerNPCTestHelper.getReply;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import games.stendhal.server.core.config.ZoneConfigurator;
 import games.stendhal.server.core.engine.SingletonRepository;
 import games.stendhal.server.core.engine.StendhalRPZone;
@@ -29,11 +33,6 @@ import games.stendhal.server.entity.npc.fsm.Engine;
 import games.stendhal.server.entity.player.Player;
 import games.stendhal.server.maps.ados.city.KidGhostNPC;
 import games.stendhal.server.maps.ados.hauntedhouse.WomanGhostNPC;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import utilities.PlayerTestHelper;
 import utilities.QuestHelper;
 
diff --git a/tests/utilities/RPClass/ConsumableTestHelperTest.java b/tests/utilities/RPClass/ConsumableTestHelperTest.java
index d0d71a7055..c723369aed 100644
--- a/tests/utilities/RPClass/ConsumableTestHelperTest.java
+++ b/tests/utilities/RPClass/ConsumableTestHelperTest.java
@@ -1,6 +1,5 @@
-/* $Id$ */
 /***************************************************************************
- *                   (C) Copyright 2003-2010 - Stendhal                    *
+ *                   (C) Copyright 2003-2015 - Stendhal                    *
  ***************************************************************************
  ***************************************************************************
  *                                                                         *
@@ -12,21 +11,22 @@
  ***************************************************************************/
 package utilities.RPClass;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertThat;
-import games.stendhal.server.entity.item.ConsumableItem;
 
 import org.junit.Test;
 
+import games.stendhal.server.entity.item.ConsumableItem;
+
 public class ConsumableTestHelperTest {
 
 	@Test
 	public void testCreate() throws Exception {
 
 		ConsumableItem eater = ConsumableTestHelper.createEater("consume");
-		assertThat(eater, is(ConsumableItem.class));
+		assertThat(eater, instanceOf(ConsumableItem.class));
 
 		ConsumableItem createImmunizer = ConsumableTestHelper.createImmunizer("consume");
-		assertThat(createImmunizer, is(ConsumableItem.class));
+		assertThat(createImmunizer, instanceOf(ConsumableItem.class));
 	}
 }