diff --git a/build.xml b/build.xml
index d6353fac1..b2c9977d0 100644
--- a/build.xml
+++ b/build.xml
@@ -629,7 +629,7 @@ under the License.
                 <pathelement location="${scratchpad.output.test.dir}"/>
                 <pathelement location="${junit.jar1.dir}"/>
             </classpath>
-            <sysproperty key="HSSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hssf/data"/>
+            <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
             <sysproperty key="HPSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hpsf/data"/>
             <sysproperty key="HDF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdf/data"/>
             <sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
@@ -664,7 +664,7 @@ under the License.
 	                                <pathelement location="${scratchpad.output.test.dir}"/>
 	                                <pathelement location="${junit.jar1.dir}"/>
 	                            </classpath>
-	            <sysproperty key="HSSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hssf/data"/>
+                <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
 	            <sysproperty key="HPSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hpsf/data"/>
 	            <sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
                 <sysproperty key="HSLF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hslf/data"/>
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/data/44297.xls b/src/testcases/org/apache/poi/hssf/data/44297.xls
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hssf/data/44297.xls
rename to src/testcases/org/apache/poi/hssf/data/44297.xls
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls b/src/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls
rename to src/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/data/MissingBits.xls b/src/testcases/org/apache/poi/hssf/data/MissingBits.xls
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hssf/data/MissingBits.xls
rename to src/testcases/org/apache/poi/hssf/data/MissingBits.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/TestDataValidation.xls b/src/testcases/org/apache/poi/hssf/data/TestDataValidation.xls
index 524136921..001432f0a 100644
Binary files a/src/testcases/org/apache/poi/hssf/data/TestDataValidation.xls and b/src/testcases/org/apache/poi/hssf/data/TestDataValidation.xls differ