diff --git a/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy b/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy
index 8c5eb334ac..9219328ed2 100755
--- a/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy
+++ b/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy
@@ -89,8 +89,8 @@ for (pkg in jclass.importedPackages) {
     }
 }
 
-def baseClass = "org.apache.activemq.openwire.DataStreamMarshaller"
-if( !jclass.superclass.simpleName.equals("Object") ) {
+def baseClass = "DataStreamMarshaller"
+if (!jclass.superclass.simpleName.equals("JNDIBaseStorable") && !jclass.superclass.simpleName.equals("Object") ) {
    baseClass = jclass.superclass.simpleName + "Marshaller";
 }
 
diff --git a/activemq-core/src/gram/script/GenerateJavaTests.groovy b/activemq-core/src/gram/script/GenerateJavaTests.groovy
index 6e8051a52a..85a444856c 100755
--- a/activemq-core/src/gram/script/GenerateJavaTests.groovy
+++ b/activemq-core/src/gram/script/GenerateJavaTests.groovy
@@ -92,7 +92,7 @@ for (pkg in jclass.importedPackages) {
 }
 
 def baseClass = "DataFileGeneratorTestSupport"
-if( !jclass.superclass.simpleName.equals("Object") ) {
+if (!jclass.superclass.simpleName.equals("JNDIBaseStorable") && !jclass.superclass.simpleName.equals("Object") ) {
    baseClass = jclass.superclass.simpleName + "Test";
 }