diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4b41c6a3f6..6e88a28c55 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -88,7 +88,7 @@ TEST_OBJECTS =  \
 	test_ffilestream.o \
 	test_fileback.o \
 	test_filestream.o \
-	test_iostream.o \
+	test_iostreams.o \
 	test_largefile.o \
 	test_memstream.o \
 	test_sstream.o \
@@ -402,6 +402,9 @@ test_wxregextest.o: $(srcdir)/regex/wxregextest.cpp $(TEST_ODEP)
 test_scopeguardtest.o: $(srcdir)/scopeguard/scopeguardtest.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/scopeguard/scopeguardtest.cpp
 
+test_iostream.o: $(srcdir)/strings/iostream.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/iostream.cpp
+
 test_strings.o: $(srcdir)/strings/strings.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/strings.cpp
 
@@ -441,6 +444,9 @@ test_fileback.o: $(srcdir)/streams/fileback.cpp $(TEST_ODEP)
 test_filestream.o: $(srcdir)/streams/filestream.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/filestream.cpp
 
+test_iostreams.o: $(srcdir)/streams/iostreams.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/iostreams.cpp
+
 test_largefile.o: $(srcdir)/streams/largefile.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/largefile.cpp
 
@@ -486,12 +492,6 @@ test_xlocale.o: $(srcdir)/xlocale/xlocale.cpp $(TEST_ODEP)
 test_xmltest.o: $(srcdir)/xml/xmltest.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/xml/xmltest.cpp
 
-test_iostream.o: $(srcdir)/strings/iostream.cpp $(TEST_ODEP)
-	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/iostream.cpp
-
-test_iostream.o: $(srcdir)/streams/iostream.cpp $(TEST_ODEP)
-	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/iostream.cpp
-
 test_gui_sample_rc.o: $(srcdir)/../samples/sample.rc $(TEST_GUI_ODEP)
 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5)  $(__EXCEPTIONS_DEFINE_p_5) $(__RTTI_DEFINE_p_5) $(__THREAD_DEFINE_p_5)   --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
 
diff --git a/tests/test_test.dsp b/tests/test_test.dsp
index 6fa217af26..6cec1f39ce 100644
--- a/tests/test_test.dsp
+++ b/tests/test_test.dsp
@@ -333,7 +333,7 @@ SOURCE=.\strings\iostream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\streams\iostream.cpp
+SOURCE=.\streams\iostreams.cpp
 # End Source File
 # Begin Source File
 
diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index dd9b752753..13e443db11 100644
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -747,7 +747,7 @@
 			<File
 				RelativePath=".\strings\iostream.cpp"/>
 			<File
-				RelativePath=".\streams\iostream.cpp"/>
+				RelativePath=".\streams\iostreams.cpp"/>
 			<File
 				RelativePath=".\streams\largefile.cpp"/>
 			<File
diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj
index 4098628499..1a3289ab8d 100644
--- a/tests/test_vc8_test.vcproj
+++ b/tests/test_vc8_test.vcproj
@@ -945,7 +945,7 @@
 				RelativePath=".\strings\iostream.cpp"
 			/>
 			<File
-				RelativePath=".\streams\iostream.cpp"
+				RelativePath=".\streams\iostreams.cpp"
 			/>
 			<File
 				RelativePath=".\streams\largefile.cpp"