diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
index ff951bb490..6d49827bf6 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
@@ -922,10 +922,7 @@ public final class TestHSSFWorkbook extends BaseTestWorkbook {
 		assertEquals("Did not have the expected size when writing the workbook: written: " + written + ", but expected: " + expected,
 				expected, written);
 		
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		wb.write(out);
-		
-		HSSFWorkbook read = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
+		HSSFWorkbook read = HSSFTestDataSamples.writeOutAndReadBack(wb);
 		assertSheetOrder(read, "Invoice", "Invoice1", "Digest", "Deferred", "Received");
 	}
 
@@ -965,11 +962,8 @@ public final class TestHSSFWorkbook extends BaseTestWorkbook {
 		assertEquals("Did not have the expected size when writing the workbook: written: " + written + ", but expected: " + expected,
 				expected, written);
 		
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		wb.write(out);
-		
-		HSSFWorkbook read = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
-		assertSheetOrder(wb, "Invoice", "Deferred", "Received", "Digest");
+		HSSFWorkbook read = HSSFTestDataSamples.writeOutAndReadBack(wb);
+		assertSheetOrder(read, "Invoice", "Deferred", "Received", "Digest");
 	}
 	
 	private void assertSheetOrder(HSSFWorkbook wb, String... sheets) {