diff --git a/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF
index 6b4a7ee31..5f8c7afea 100644
--- a/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
  org.eclipse.core.runtime,
  com.ibm.wala.cast.test;bundle-version="1.0.0",
  com.ibm.wala.cast.java.polyglot;bundle-version="1.0.0",
- org.junit;bundle-version="4.0.0"
+ org.junit;bundle-version="4.0.0",
+ com.ibm.wala.cast.java.test.data;bundle-version="1.3.4"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/com.ibm.wala.cast.java.polyglot.test/pom.xml b/com.ibm.wala.cast.java.polyglot.test/pom.xml
index 717105108..2300b2e68 100644
--- a/com.ibm.wala.cast.java.polyglot.test/pom.xml
+++ b/com.ibm.wala.cast.java.polyglot.test/pom.xml
@@ -2,13 +2,42 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>WALA</artifactId>
-    <groupId>com.ibm.wala</groupId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
-  <groupId>com.ibm.wala</groupId>
+    <parent>
+        <groupId>com.ibm.wala</groupId>
+        <artifactId>WALA</artifactId>
+        <version>1.3.4-SNAPSHOT</version>
+    </parent>
   <artifactId>com.ibm.wala.cast.java.polyglot.test</artifactId>
-  <version>1.0.0</version>
   <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>test</phase>
+            <configuration>
+              <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+              <argLine>-Xmx800M -ea</argLine>
+              <redirectTestOutputToFile>true</redirectTestOutputToFile>
+              <workingDirectory>${basedir}/../com.ibm.wala.cast.java.test.data</workingDirectory>
+            </configuration>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.7</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies> 
 </project>
diff --git a/com.ibm.wala.cast.java.test.data/build.xml b/com.ibm.wala.cast.java.test.data/build.xml
index be15e70da..318fd931e 100644
--- a/com.ibm.wala.cast.java.test.data/build.xml
+++ b/com.ibm.wala.cast.java.test.data/build.xml
@@ -14,12 +14,15 @@
   <property name="compilerArg" value=""/>
   <property name="javacSource" value="1.5"/>
   <property name="javacTarget" value="1.5"/>
-  <!-- This property has been updated to correspond to the paths used by the latest Java update
-       on Mac OS X 10.6 (Java version 1.6.0_22).  If you are not using this version of Mac OS X or Java,
-       try changing the value of the property to "${java.home}/../../../Classes" -->
-  <condition property="dir_bootclasspath" value="${java.home}/../Classes">
-    <os family="mac"/>
-  </condition>
+	<!-- This property has been updated to correspond to the paths used by the latest Java update
+	on Mac OS X 10.6 (Java version 1.6.0_22).  If you are not using this version of Mac OS X or Java,
+	try changing the value of the property to "${java.home}/../../../Classes" -->
+    <condition property="dir_bootclasspath" value="${java.home}/../Classes">
+      <and>
+            <os family="mac"/>
+            <equals arg1="${ant.java.version}" arg2="1.6" />
+      </and>
+    </condition>
   <property name="dir_bootclasspath" value="${java.home}/lib"/>
   <path id="path_bootclasspath">
     <fileset dir="${dir_bootclasspath}">
diff --git a/com.ibm.wala.cast.java.test.data/pom.xml b/com.ibm.wala.cast.java.test.data/pom.xml
index 9b9f9d822..c5cc24789 100644
--- a/com.ibm.wala.cast.java.test.data/pom.xml
+++ b/com.ibm.wala.cast.java.test.data/pom.xml
@@ -9,4 +9,37 @@
     </parent>
   <artifactId>com.ibm.wala.cast.java.test.data</artifactId>
   <packaging>eclipse-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.7</version>
+				<executions>
+					<execution>
+						<phase>process-resources</phase>
+						<configuration>
+							<tasks>
+								<property name="compile_classpath" refid="maven.compile.classpath" />
+								<ant antfile="${basedir}/build.xml" target="jar" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+              <dependencies>
+                <dependency>
+                  <groupId>com.sun</groupId>
+                  <artifactId>tools</artifactId>
+                  <version>1.7</version>
+                  <scope>system</scope>
+                  <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                </dependency>
+              </dependencies>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>
diff --git a/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
index e5c8e8f21..c7c723d1d 100644
--- a/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Java AST WALA Test Plug-in
 Bundle-SymbolicName: com.ibm.wala.cast.java.test
-Bundle-Version: 1.0.0
+Bundle-Version: 1.3.4.qualifier
 Bundle-Activator: com.ibm.wala.cast.java.test.TestPlugin
 Bundle-Vendor: IBM
 Require-Bundle: com.ibm.wala.core.tests,
diff --git a/com.ibm.wala.cast.java.test/pom.xml b/com.ibm.wala.cast.java.test/pom.xml
index 8060e2b93..7f2454c3b 100644
--- a/com.ibm.wala.cast.java.test/pom.xml
+++ b/com.ibm.wala.cast.java.test/pom.xml
@@ -8,5 +8,35 @@
         <version>1.3.4-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.cast.java.test</artifactId>
-  <packaging>eclipse-test-plugin</packaging>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>test</phase>
+            <configuration>
+              <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+              <argLine>-Xmx800M -ea</argLine>
+              <redirectTestOutputToFile>true</redirectTestOutputToFile>
+            </configuration>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.7</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies> 
 </project>
diff --git a/com.ibm.wala.cast.test/pom.xml b/com.ibm.wala.cast.test/pom.xml
index 6d9346166..2d5cc4b48 100644
--- a/com.ibm.wala.cast.test/pom.xml
+++ b/com.ibm.wala.cast.test/pom.xml
@@ -8,5 +8,35 @@
         <version>1.3.4-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.cast.test</artifactId>
-  <packaging>eclipse-test-plugin</packaging>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>test</phase>
+            <configuration>
+              <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+              <argLine>-Xmx800M -ea</argLine>
+              <redirectTestOutputToFile>true</redirectTestOutputToFile>
+            </configuration>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.7</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies> 
 </project>
diff --git a/pom.xml b/pom.xml
index 7cb5369a7..54811fa45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,15 @@
 		<module>com.ibm.wala.util</module>
 
                 <module>com.ibm.wala.core.testdata</module>
-                <module>com.ibm.wala.core.tests</module>
+<!--                <module>com.ibm.wala.core.tests</module> -->
 
 		<module>com.ibm.wala.cast</module>
+                <module>com.ibm.wala.cast.test</module>
 		<module>com.ibm.wala.cast.java</module>
+                <module>com.ibm.wala.cast.java.test</module>
+                <module>com.ibm.wala.cast.java.test.data</module>
 		<module>com.ibm.wala.cast.java.polyglot</module>
+		<module>com.ibm.wala.cast.java.polyglot.test</module>
 		<module>com.ibm.wala.cast.js</module>
 		<module>com.ibm.wala.cast.js.rhino</module>