diff --git a/tests/streams/tempfile.cpp b/tests/streams/tempfile.cpp
index bd1d3e29ee..7c5c1f323d 100644
--- a/tests/streams/tempfile.cpp
+++ b/tests/streams/tempfile.cpp
@@ -24,29 +24,7 @@
 
 #if wxUSE_STREAMS && wxUSE_FILE
 
-
-///////////////////////////////////////////////////////////////////////////////
-// Self deleting test file
-
-class TestFile
-{
-public:
-    TestFile();
-    ~TestFile() { if (wxFileExists(m_name)) wxRemoveFile(m_name); }
-    wxString GetName() const { return m_name; }
-private:
-    wxString m_name;
-};
-
-// Initialise with a test pattern so we can see if the file is replaced
-//
-TestFile::TestFile()
-{
-    wxFile file;
-    m_name = wxFileName::CreateTempFileName(wxT("wxtest"), &file);
-    file.Write("Before", 6);
-}
-
+#include "testfile.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // The test case
diff --git a/tests/testfile.h b/tests/testfile.h
new file mode 100644
index 0000000000..d982ee9334
--- /dev/null
+++ b/tests/testfile.h
@@ -0,0 +1,38 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/testfile.h
+// Purpose:     TestFile class
+// Author:      Mike Wetherell
+// RCS-ID:      $Id$
+// Copyright:   (c) 2005 Mike Wetherell
+// Licence:     wxWidgets licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_TESTS_TEMPFILE_H_
+#define _WX_TESTS_TEMPFILE_H_
+
+#include "wx/filefn.h"
+#include "wx/filename.h"
+
+// ----------------------------------------------------------------------------
+// TestFile: self deleting test file in temporary directory
+// ----------------------------------------------------------------------------
+
+class TestFile
+{
+public:
+    TestFile()
+    {
+        wxFile file;
+        m_name = wxFileName::CreateTempFileName(wxT("wxtest"), &file);
+        file.Write("Before", 6);
+    }
+
+    ~TestFile() { if (wxFileExists(m_name)) wxRemoveFile(m_name); }
+    wxString GetName() const { return m_name; }
+
+private:
+    wxString m_name;
+};
+
+#endif // _WX_TESTS_TEMPFILE_H_
+