diff --git a/activemq-core/project.xml b/activemq-core/project.xml
index 1aa347aa17..1c23754723 100755
--- a/activemq-core/project.xml
+++ b/activemq-core/project.xml
@@ -341,13 +341,9 @@
                 <!-- These are performance tests so take too long to run -->
                 <exclude>**/perf/*</exclude>
                 
-
                 <!-- these tests don't always work when rendezvous can't work on the OSS -->
                 <exclude>**/RendezvousDiscoverTransportTest.*</exclude>
 
-                <!-- This test currently fails -->
-                <exclude>**/ItStillMarshallsTheSameTest.*</exclude>
-                
                 <!-- Kaha in flux - removing tests -->
                 <exclude>**/KahaXARecoveryBrokerTest.*</exclude>
                 <exclude>**/KahaRecoveryBrokerTest.*</exclude>
diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java
index 136223bb95..3820f0c025 100644
--- a/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java
+++ b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java
@@ -24,35 +24,19 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import junit.framework.Assert;
 
 abstract public class DataFileGenerator extends Assert {
-
-    private static final Log log = LogFactory.getLog(DataFileGenerator.class);
     
     static final File moduleBaseDir;
     static final File controlDir;
     static final File classFileDir; 
     
     static {
-        File basedir=null;
-        try {
-            URL resource = DataFileGenerator.class.getResource("DataFileGenerator.class");
-            URI baseURI = new URI(resource.toString()).resolve("../../../../..");
-            basedir = new File(baseURI).getCanonicalFile();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        moduleBaseDir = basedir;
+        moduleBaseDir = new File(System.getProperty("basedir", "."));
         controlDir = new File(moduleBaseDir, "src/test/resources/openwire-control");
         classFileDir = new File(moduleBaseDir, "src/test/java/org/apache/activemq/openwire");
     }
@@ -69,7 +53,7 @@ abstract public class DataFileGenerator extends Assert {
      * @throws IllegalAccessException
      */
     public static ArrayList getAllDataFileGenerators() throws Exception{
-        log.info("Looking for generators in : "+classFileDir);
+        System.out.println("Looking for generators in : "+classFileDir);
         ArrayList l = new ArrayList();
         File[] files = classFileDir.listFiles();
         for (int i = 0; files!=null && i < files.length; i++) {
@@ -89,10 +73,10 @@ abstract public class DataFileGenerator extends Assert {
         for (Iterator iter = generators.iterator(); iter.hasNext();) {
             DataFileGenerator object = (DataFileGenerator) iter.next();
             try {
-                log.info("Processing: "+object.getClass());
+                System.out.println("Processing: "+object.getClass());
                 object.generateControlFile();
             } catch (Exception e) {
-                log.error("Error while processing: "+object.getClass() + ". Reason: " + e, e);
+                System.err.println("Error while processing: "+object.getClass() + ". Reason: " + e);
             }
         }
     }
@@ -130,7 +114,7 @@ abstract public class DataFileGenerator extends Assert {
         ArrayList generators = getAllDataFileGenerators();
         for (Iterator iter = generators.iterator(); iter.hasNext();) {
             DataFileGenerator object = (DataFileGenerator) iter.next();
-            log.info("Processing: "+object.getClass());
+            System.out.println("Processing: "+object.getClass());
             object.assertControlFileIsEqual();
         }
     }
diff --git a/activemq-core/src/test/resources/openwire-control/org.activemq.openwire.BrokerInfoData.bin b/activemq-core/src/test/resources/openwire-control/org.activemq.openwire.BrokerInfoData.bin
deleted file mode 100644
index 9e034f89c5..0000000000
Binary files a/activemq-core/src/test/resources/openwire-control/org.activemq.openwire.BrokerInfoData.bin and /dev/null differ
diff --git a/activemq-core/src/test/resources/openwire-control/org.activemq.openwire.WireFormatInfoData.bin b/activemq-core/src/test/resources/openwire-control/org.activemq.openwire.WireFormatInfoData.bin
deleted file mode 100644
index 88dd693d97..0000000000
Binary files a/activemq-core/src/test/resources/openwire-control/org.activemq.openwire.WireFormatInfoData.bin and /dev/null differ
diff --git a/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin b/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin
new file mode 100644
index 0000000000..958806924f
Binary files /dev/null and b/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin differ
diff --git a/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin b/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin
new file mode 100644
index 0000000000..101210613c
Binary files /dev/null and b/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin differ