diff --git a/pom.xml b/pom.xml
index e3d0658be2..97769c03e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <api.version>unknown</api.version>
+    <junit.version>4.10</junit.version>
   </properties>
   <scm>
     <connection>scm:git:git://github.com/Bukkit/CraftBukkit.git</connection>
@@ -104,6 +105,11 @@
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+    </dependency>
   </dependencies>
   <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
   <build>
@@ -194,6 +200,13 @@
           <target>1.5</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <workingDirectory>${basedir}/target/test-server</workingDirectory>
+        </configuration>
+      </plugin>
     </plugins>
     <pluginManagement>
     	<plugins>