diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 1729e64285..2773218ae9 100644
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -26,7 +26,7 @@
 #include "wx/ioswrap.h"
 
 // need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects
-static wxSTD ostream& operator<<(wxSTD ostream& ostr, const wxDateTime& dt)
+static std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt)
 {
     ostr << dt.FormatISODate() << " " << dt.FormatISOTime();
 
diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index d7a0ded248..2a2ef773e6 100644
--- a/tests/filename/filenametest.cpp
+++ b/tests/filename/filenametest.cpp
@@ -290,7 +290,7 @@ void FileNameTestCase::TestNormalize()
     {
         const wxChar *original;
         int flags;
-        wxString expected;
+        const wxChar * expected;
     } tests[] =
     {
         // test wxPATH_NORM_ENV_VARS
@@ -335,7 +335,7 @@ void FileNameTestCase::TestNormalize()
         );
 
         // compare result with expected string
-        CPPUNIT_ASSERT_EQUAL( tests[i].expected, fn.GetFullPath(wxPATH_UNIX) );
+        CPPUNIT_ASSERT_EQUAL( wxString(tests[i].expected), fn.GetFullPath(wxPATH_UNIX) );
     }
 }
 
diff --git a/tests/geometry/rect.cpp b/tests/geometry/rect.cpp
index cb196373ce..a38fd3cbd5 100644
--- a/tests/geometry/rect.cpp
+++ b/tests/geometry/rect.cpp
@@ -28,7 +28,7 @@
 // ----------------------------------------------------------------------------
 
 // this operator is needed to use CPPUNIT_ASSERT_EQUAL with wxRects
-wxSTD ostream& operator<<(wxSTD ostream& os, const wxRect& r)
+std::ostream& operator<<(std::ostream& os, const wxRect& r)
 {
     os << "{"
         << r.x << ", " << r.y << ", " << r.width << ", " << r.height
diff --git a/tests/streams/fileback.cpp b/tests/streams/fileback.cpp
index 484c95a8d5..7a83aa13e1 100644
--- a/tests/streams/fileback.cpp
+++ b/tests/streams/fileback.cpp
@@ -18,6 +18,15 @@
     #include "wx/wx.h"
 #endif
 
+
+// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxFileOffset objects
+static std::ostream& operator<<(std::ostream& ostr, const wxFileOffset& fo)
+{
+    ostr << fo;
+    return ostr;
+}
+
+
 #include "wx/mstream.h"
 #include "wx/private/fileback.h"
 #include "bstream.h"
diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp
index 01b6da60af..821cd76fef 100644
--- a/tests/textfile/textfiletest.cpp
+++ b/tests/textfile/textfiletest.cpp
@@ -64,7 +64,7 @@ private:
     // create the test file with the given contents
     static void CreateTestFile(const char *contents)
     {
-        return CreateTestFile(strlen(contents), contents);
+        CreateTestFile(strlen(contents), contents);
     }
 
     // create the test file with the given contents (version must be used if