diff --git a/build.xml b/build.xml
index 0e67323b0b..0ac55d2348 100644
--- a/build.xml
+++ b/build.xml
@@ -795,8 +795,8 @@ under the License.
             <sysproperty key="HSLF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hslf/data"/>
             <sysproperty key="HDGF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdgf/data"/>
             <sysproperty key="OOXML.testdata.path" file="${ooxml.src.test}/org/apache/poi/ooxml/data"/> 
-            <sysproperty key="openxml4j.compliance.input" file="${ooxml.src.test}/org/apache/poi/openxml4j/opc/compliance/input"/> 
-            <sysproperty key="openxml4j.testdata.input" file="${ooxml.src.test}/org/apache/poi/openxml4j/opc/INPUT"/> 
+            <sysproperty key="openxml4j.compliance.input" file="${ooxml.src.test}/org/apache/poi/openxml4j/opc/compliance/data"/> 
+            <sysproperty key="openxml4j.testdata.input" file="${ooxml.src.test}/org/apache/poi/openxml4j/opc/data"/> 
             <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -804,7 +804,6 @@ under the License.
                 <fileset dir="${ooxml.src.test}">
                     <include name="**/Test*.java"/>
                     <exclude name="**/All*Tests.java"/>
-                    <exclude name="**/TestCore.java"/> <!--non-junit class from OpenXML4j-->
                 </fileset>
             </batchtest>
         </junit>
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_SUCCESS.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_SUCCESS.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_SUCCESS.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_SUCCESS.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_DerivedPartNameFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_DerivedPartNameFAIL.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_DerivedPartNameFAIL.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_DerivedPartNameFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/ExcelWithHyperlinks.xlsx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/ExcelWithHyperlinks.xlsx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/ExcelWithHyperlinks.xlsx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/ExcelWithHyperlinks.xlsx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestOpenPackageINPUT.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestOpenPackageINPUT.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestOpenPackageINPUT.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestOpenPackageINPUT.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCommon.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCommon.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCommon.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCommon.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCoreProperiesGetters.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesGetters.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCoreProperiesGetters.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesGetters.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCoreProperiesSetters.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesSetters.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCoreProperiesSetters.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesSetters.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageThumbnail.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageThumbnail.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageThumbnail.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageThumbnail.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/sample.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/sample.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/sample.xlsx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.xlsx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/sample.xlsx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.xlsx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/thumbnail.jpg b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/thumbnail.jpg
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/thumbnail.jpg
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/thumbnail.jpg
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/INPUT/sample.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/data/sample.docx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/INPUT/sample.docx
rename to src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/data/sample.docx