diff --git a/asterix-app/pom.xml b/asterix-app/pom.xml
index f4c57ce..299bb86 100644
--- a/asterix-app/pom.xml
+++ b/asterix-app/pom.xml
@@ -100,12 +100,6 @@
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>edu.uci.ics.hyracks</groupId>
 			<artifactId>hyracks-control-cc</artifactId>
 		</dependency>
diff --git a/asterix-aql/pom.xml b/asterix-aql/pom.xml
index 5ec2b0f..52640c2 100644
--- a/asterix-aql/pom.xml
+++ b/asterix-aql/pom.xml
@@ -115,12 +115,6 @@
 	</build>
 
 	<dependencies>
-                <dependency>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                        <version>4.8.1</version>
-                        <scope>test</scope>
-                </dependency>
 		<dependency>
 			<groupId>edu.uci.ics.asterix</groupId>
 			<artifactId>asterix-common</artifactId>
diff --git a/asterix-common/pom.xml b/asterix-common/pom.xml
index 9203d86..9602cf2 100644
--- a/asterix-common/pom.xml
+++ b/asterix-common/pom.xml
@@ -169,12 +169,6 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>edu.uci.ics.hyracks</groupId>
 			<artifactId>hyracks-storage-am-lsm-btree</artifactId>
 		</dependency>
diff --git a/asterix-events/pom.xml b/asterix-events/pom.xml
index 00996f4..46d944f 100644
--- a/asterix-events/pom.xml
+++ b/asterix-events/pom.xml
@@ -149,12 +149,6 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>args4j</groupId>
 			<artifactId>args4j</artifactId>
 			<version>2.0.12</version>
diff --git a/asterix-external-data/pom.xml b/asterix-external-data/pom.xml
index 4f57a80..9f99f88 100644
--- a/asterix-external-data/pom.xml
+++ b/asterix-external-data/pom.xml
@@ -92,12 +92,6 @@
 			<type>jar</type>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>edu.uci.ics.asterix</groupId>
 			<artifactId>asterix-om</artifactId>
 			<version>0.8.4-SNAPSHOT</version>
diff --git a/asterix-fuzzyjoin/pom.xml b/asterix-fuzzyjoin/pom.xml
index dc49e55..162e6ea 100644
--- a/asterix-fuzzyjoin/pom.xml
+++ b/asterix-fuzzyjoin/pom.xml
@@ -50,11 +50,9 @@
 
   <dependencies>
     <dependency>
+      <!-- Dependency management inherited from top-level asterixdb -->
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <type>jar</type>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/asterix-installer/pom.xml b/asterix-installer/pom.xml
index 0c332ed..c24a2e4 100644
--- a/asterix-installer/pom.xml
+++ b/asterix-installer/pom.xml
@@ -125,12 +125,6 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>args4j</groupId>
 			<artifactId>args4j</artifactId>
 			<version>2.0.12</version>
diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml b/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
index 37d4b0f..d164cde 100644
--- a/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
+++ b/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
@@ -42,10 +42,9 @@
 
   <dependencies>
     <dependency>
+      <!-- Dependency management inherited from top-level asterixdb -->
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml b/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
index 5f2ffaf..5fddc22 100644
--- a/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
+++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
@@ -42,12 +42,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>2.0.2</version>
diff --git a/asterix-tools/pom.xml b/asterix-tools/pom.xml
index 83dbe0e..38d7ffc 100644
--- a/asterix-tools/pom.xml
+++ b/asterix-tools/pom.xml
@@ -146,12 +146,6 @@
 			<version>4.2.2</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 8e54001..7e76347 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,16 +40,14 @@
 	    <plugin>
 	      <groupId>org.apache.maven.plugins</groupId>
 	      <artifactId>maven-surefire-plugin</artifactId>
-	      <version>2.8</version>
+	      <version>2.16</version>
 	      <configuration>
 		<failIfNoTests>false</failIfNoTests>
 		<systemPropertyVariables>
                   <skipFredSlowTests>true</skipFredSlowTests>
 		</systemPropertyVariables>
-		<!-- doesn't work from m2eclipse, currently <additionalClasspathElements> 
-		     <additionalClasspathElement>${basedir}/src/main/resources</additionalClasspathElement> 
-		     </additionalClasspathElements> -->
-		<forkMode>pertest</forkMode>
+		<forkCount>1</forkCount>
+                <reuseForks>false</reuseForks>
 		<argLine>-enableassertions -Xmx${test.heap.size}m
 		-Dfile.encoding=UTF-8
 		-Djava.util.logging.config.file=${user.home}/logging.properties
@@ -186,6 +184,11 @@
 	</repositories>
         <dependencyManagement>
     	<dependencies>
+          <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+          </dependency>
     		<dependency>
     			<groupId>edu.uci.ics.hyracks</groupId>
     			<artifactId>algebricks-compiler</artifactId>