diff --git a/component/core/pom.xml b/component/core/pom.xml
index ecf585ee79..03921e7dab 100644
--- a/component/core/pom.xml
+++ b/component/core/pom.xml
@@ -71,6 +71,37 @@
         </executions>
       </plugin>
 
+      <!-- Reserve network ports -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-byteman-port</id>
+            <goals>
+              <goal>reserve-network-port</goal>
+            </goals>
+            <phase>process-test-classes</phase>
+            <configuration>
+              <portNames>
+                <portName>org.jboss.byteman.contrib.bmunit.agent.port</portName>
+              </portNames>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.12</version>
+        <configuration>
+          <systemPropertyVariables>
+            <org.jboss.byteman.contrib.bmunit.agent.port>${org.jboss.byteman.contrib.bmunit.agent.port}</org.jboss.byteman.contrib.bmunit.agent.port>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index d37671cf11..fdddec78c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
     <hsqldb.version>2.0.0</hsqldb.version>
     <javassist.version>3.14.0-GA</javassist.version>
     <junit.version>4.10</junit.version>
-    <byteman.version>2.0.0</byteman.version>
+    <byteman.version>2.0.4</byteman.version>
     <mysql-connector-java.version>5.1.6</mysql-connector-java.version>
     <rome.version>1.0</rome.version>
     <stax.version>1.0</stax.version>