Index: src/main/java/org/castor/xmlctf/compiler/SunJavaCompiler.java
===================================================================
--- src/main/java/org/castor/xmlctf/compiler/SunJavaCompiler.java	(revision 7075)
+++ src/main/java/org/castor/xmlctf/compiler/SunJavaCompiler.java	(working copy)
@@ -161,7 +161,13 @@
             args.add(_javaVersion);
         }
         args.add("-classpath");
-        args.add(System.getProperty("java.class.path") + ";" + destDir.getAbsolutePath());
+
+        String classPathOverride = System.getProperty("xmlctf.classpath.override");
+        if (classPathOverride != null) {
+        	args.add(classPathOverride + ";" + destDir.getAbsolutePath());
+        } else {
+        	args.add(System.getProperty("java.class.path") + ";" + destDir.getAbsolutePath());
+        }
         args.add("-d");
         args.add(destDir.getAbsolutePath());
         args.add("-sourcepath");
Index: pom.xml
===================================================================
--- pom.xml	(revision 7075)
+++ pom.xml	(working copy)
@@ -29,9 +29,9 @@
 				<configuration>
 					<source>1.4</source>
 					<target>1.4</target>
-					<includes>
+					<!-- includes>
 						<include implementation="java.lang.String">org/exolab/castor/tests/framework/**</include>
-					</includes>
+					</includes-->
 				</configuration>
 			</plugin>
 			
@@ -43,6 +43,25 @@
 						<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
 					</archive>
 				</configuration>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>maven-plugins</artifactId>
+				<executions>
+					<execution>
+						<phase>test</phase>
+						<configuration>
+						    <!-- testRoot may be overridden using systemproperty -Dcastor.xmlctf.testRoot -->
+						    <testRoot>./tests/MasterTestSuite</testRoot>
+					        <verbose>false</verbose>
+					        <printStack>false</printStack>
+				        </configuration>
+						<goals>
+							<goal>xmlctf-run-text</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			
 			<plugin>
@@ -58,7 +77,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 				<executions>
-					<execution>
+					<execution>
 						<goals>
 							<goal>jar</goal>
 						</goals>
@@ -85,7 +104,7 @@
 		<dependency>
 			<groupId>org.codehaus.castor</groupId>
 			<artifactId>castor-codegen</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.3-SNAPSHOT</version>
 		</dependency>
 
         <dependency>
@@ -98,7 +117,14 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>3.8.2</version>
-		</dependency>
+		</dependency>
+		
+		<!--  redundant; will be removed once we switch to parent structure -->
+		<dependency>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+            <version>2.0.8</version>
+        </dependency>
 
 	</dependencies>