diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml
index a266ff96b..30de909b2 100644
--- a/dependency-check-ant/pom.xml
+++ b/dependency-check-ant/pom.xml
@@ -89,7 +89,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
                                     <directory>${basedir}/../src/test/resources</directory>
                                     <filtering>false</filtering>
                                     <includes>
-                                        <include>axis2*.jar</include>
+                                        <include>org.mortbay.*.jar</include>
                                     </includes>
                                 </resource>
                             </resources>
@@ -127,7 +127,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
                                     <directory>${basedir}/../src/test/resources</directory>
                                     <filtering>false</filtering>
                                     <includes>
-                                        <include>*.war</include>
+                                        <include>struts.jar</include>
                                     </includes>
                                 </resource>
                             </resources>
diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml
index 17434e1ff..60d3339b8 100644
--- a/dependency-check-core/pom.xml
+++ b/dependency-check-core/pom.xml
@@ -481,5 +481,54 @@ along with Dependency-Check.  If not, see <http://www.gnu.org/licenses />.
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache-core</artifactId>
+            <version>2.2.0</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <version>2.1.2</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.0</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-spring</artifactId>
+            <version>1.4.1</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-adb</artifactId>
+            <version>1.4.1</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <!--dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>daytrader-ear</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency-->
+        <!--dependency>
+            <groupId>org.dojotoolkit</groupId>
+            <artifactId>dojo-war</artifactId>
+            <version>1.3.0</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency-->
     </dependencies>
 </project>
diff --git a/src/test/resources/axis2-1.4.1.jar b/src/test/resources/axis2-1.4.1.jar
deleted file mode 100644
index 9abab85a4..000000000
Binary files a/src/test/resources/axis2-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-adb-1.4.1.jar b/src/test/resources/axis2-adb-1.4.1.jar
deleted file mode 100644
index 1a13e3e76..000000000
Binary files a/src/test/resources/axis2-adb-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-adb-codegen-1.4.1.jar b/src/test/resources/axis2-adb-codegen-1.4.1.jar
deleted file mode 100644
index cb5221ad2..000000000
Binary files a/src/test/resources/axis2-adb-codegen-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-ant-plugin-1.4.1.jar b/src/test/resources/axis2-ant-plugin-1.4.1.jar
deleted file mode 100644
index 068905857..000000000
Binary files a/src/test/resources/axis2-ant-plugin-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-clustering-1.4.1.jar b/src/test/resources/axis2-clustering-1.4.1.jar
deleted file mode 100644
index 687ba6dce..000000000
Binary files a/src/test/resources/axis2-clustering-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-codegen-1.4.1.jar b/src/test/resources/axis2-codegen-1.4.1.jar
deleted file mode 100644
index d2dcad159..000000000
Binary files a/src/test/resources/axis2-codegen-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-corba-1.4.1.jar b/src/test/resources/axis2-corba-1.4.1.jar
deleted file mode 100644
index 543a79675..000000000
Binary files a/src/test/resources/axis2-corba-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-fastinfoset-1.4.1.jar b/src/test/resources/axis2-fastinfoset-1.4.1.jar
deleted file mode 100644
index 400cb4809..000000000
Binary files a/src/test/resources/axis2-fastinfoset-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-java2wsdl-1.4.1.jar b/src/test/resources/axis2-java2wsdl-1.4.1.jar
deleted file mode 100644
index 7031ad3e6..000000000
Binary files a/src/test/resources/axis2-java2wsdl-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-jaxbri-1.4.1.jar b/src/test/resources/axis2-jaxbri-1.4.1.jar
deleted file mode 100644
index 2654a926d..000000000
Binary files a/src/test/resources/axis2-jaxbri-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-jaxws-1.4.1.jar b/src/test/resources/axis2-jaxws-1.4.1.jar
deleted file mode 100644
index 388b087f5..000000000
Binary files a/src/test/resources/axis2-jaxws-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-jaxws-api-1.4.1.jar b/src/test/resources/axis2-jaxws-api-1.4.1.jar
deleted file mode 100644
index 7cf2e8e94..000000000
Binary files a/src/test/resources/axis2-jaxws-api-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-jibx-1.4.1.jar b/src/test/resources/axis2-jibx-1.4.1.jar
deleted file mode 100644
index ba034751f..000000000
Binary files a/src/test/resources/axis2-jibx-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-json-1.4.1.jar b/src/test/resources/axis2-json-1.4.1.jar
deleted file mode 100644
index 20762d5e6..000000000
Binary files a/src/test/resources/axis2-json-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-jws-api-1.4.1.jar b/src/test/resources/axis2-jws-api-1.4.1.jar
deleted file mode 100644
index b7694d199..000000000
Binary files a/src/test/resources/axis2-jws-api-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-kernel-1.4.1.jar b/src/test/resources/axis2-kernel-1.4.1.jar
deleted file mode 100644
index dff9bb8b6..000000000
Binary files a/src/test/resources/axis2-kernel-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-metadata-1.4.1.jar b/src/test/resources/axis2-metadata-1.4.1.jar
deleted file mode 100644
index 1390bbe90..000000000
Binary files a/src/test/resources/axis2-metadata-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-mtompolicy-1.4.1.jar b/src/test/resources/axis2-mtompolicy-1.4.1.jar
deleted file mode 100644
index e9b82c394..000000000
Binary files a/src/test/resources/axis2-mtompolicy-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-saaj-1.4.1.jar b/src/test/resources/axis2-saaj-1.4.1.jar
deleted file mode 100644
index 714b248c1..000000000
Binary files a/src/test/resources/axis2-saaj-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-saaj-api-1.4.1.jar b/src/test/resources/axis2-saaj-api-1.4.1.jar
deleted file mode 100644
index b0325401d..000000000
Binary files a/src/test/resources/axis2-saaj-api-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-spring-1.4.1.jar b/src/test/resources/axis2-spring-1.4.1.jar
deleted file mode 100644
index f9f2e2993..000000000
Binary files a/src/test/resources/axis2-spring-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/axis2-xmlbeans-1.4.1.jar b/src/test/resources/axis2-xmlbeans-1.4.1.jar
deleted file mode 100644
index 43f6c721c..000000000
Binary files a/src/test/resources/axis2-xmlbeans-1.4.1.jar and /dev/null differ
diff --git a/src/test/resources/ehcache-core-2.2.0.jar b/src/test/resources/ehcache-core-2.2.0.jar
deleted file mode 100644
index 89af1734e..000000000
Binary files a/src/test/resources/ehcache-core-2.2.0.jar and /dev/null differ
diff --git a/src/test/resources/jetty-6.1.0.jar b/src/test/resources/jetty-6.1.0.jar
deleted file mode 100644
index 6b01acd52..000000000
Binary files a/src/test/resources/jetty-6.1.0.jar and /dev/null differ
diff --git a/src/test/resources/struts2-core-2.1.2.jar b/src/test/resources/struts2-core-2.1.2.jar
deleted file mode 100644
index f6112a0f7..000000000
Binary files a/src/test/resources/struts2-core-2.1.2.jar and /dev/null differ