diff --git a/src/testcases/org/apache/poi/util/TestTempFile.java b/src/testcases/org/apache/poi/util/TestTempFile.java
index 8f0e8a7b8..c41032fe2 100644
--- a/src/testcases/org/apache/poi/util/TestTempFile.java
+++ b/src/testcases/org/apache/poi/util/TestTempFile.java
@@ -20,6 +20,7 @@ import junit.framework.TestCase;
 
 import java.io.File;
 import java.io.FileWriter;
+import java.io.IOException;
 
 /**
  * @author Glen Stampoultzis
@@ -39,4 +40,28 @@ public class TestTempFile extends TestCase {
 
         // Can't think of a good way to check whether a file is actually deleted since it would require the VM to stop.
     }
-}
\ No newline at end of file
+    
+    public void testConstructor() {
+        // can currently be constructed...
+        new TempFile();
+    }
+    
+    public void testSetTempFileCreationStrategy() throws IOException {
+        TempFile.setTempFileCreationStrategy(new TempFile.DefaultTempFileCreationStrategy());
+        
+        File file1 = TempFile.createTempFile("TestTempFile", ".tst");
+        File file2 = TempFile.createTempFile("TestTempFile", ".tst");
+        assertFalse(file1.equals(file2));
+        assertNotNull(file2);
+        assertTrue(file2.delete());
+        assertNotNull(file1);
+        assertTrue(file1.delete());
+        
+        try {
+            TempFile.setTempFileCreationStrategy(null);
+            fail("Expecting an exception here");
+        } catch (IllegalArgumentException e) {
+            // expecting an exception here...
+        }
+    }
+}