diff --git a/pom.xml b/pom.xml
index 085636e..c2cfa43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,16 +21,23 @@
 	<packaging>pom</packaging>
 	<name>hivesterix</name>
 
-	<parent>
-	  <groupId>edu.uci.ics.hyracks</groupId>
-	  <artifactId>fullstack</artifactId>
-	  <version>0.2.13-SNAPSHOT</version>
-	</parent>
-
 	<properties>
 		<jvm.extraargs />
+        <hivesterix.perf.tests>**/hivesterix/perf/PerfTestSuite.java</hivesterix.perf.tests>
+        <global.test.includes>**/*TestSuite.java,**/*Test.java</global.test.includes>
+        <global.test.excludes>**/Abstract*.java,${hivesterix.perf.tests}</global.test.excludes>
 	</properties>
 
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>4.8.1</version>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+
 	<profiles>
 		<profile>
 			<id>macosx</id>
@@ -61,6 +68,28 @@
 				<artifactId>versions-maven-plugin</artifactId>
 				<version>1.2</version>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.16</version>
+				<configuration>
+					<failIfNoTests>false</failIfNoTests>
+					<forkCount>1</forkCount>
+					<reuseForks>false</reuseForks>
+					<argLine>-enableassertions -Xmx2048m
+					-Dfile.encoding=UTF-8
+					-Djava.util.logging.config.file=${user.home}/logging.properties
+					-Xdebug
+					-Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n</argLine>
+				<includes>
+					<include>${global.test.includes},${test.includes}</include>
+				</includes>
+				<excludes>
+					<exclude>${global.test.excludes},${test.excludes}</exclude>
+				</excludes>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>