diff --git a/Foundation/testsuite/src/TextTestSuite.cpp b/Foundation/testsuite/src/TextTestSuite.cpp
index a89d0c45b..948e3be3e 100644
--- a/Foundation/testsuite/src/TextTestSuite.cpp
+++ b/Foundation/testsuite/src/TextTestSuite.cpp
@@ -37,8 +37,9 @@
 #include "StreamConverterTest.h"
 #include "TextEncodingTest.h"
 #include "UTF8StringTest.h"
+#ifndef POCO_NO_WSTRING
 #include "UnicodeConverterTest.h"
-
+#endif
 
 CppUnit::Test* TextTestSuite::suite()
 {
@@ -50,7 +51,9 @@ CppUnit::Test* TextTestSuite::suite()
 	pSuite->addTest(StreamConverterTest::suite());
 	pSuite->addTest(TextEncodingTest::suite());
 	pSuite->addTest(UTF8StringTest::suite());
+#ifndef POCO_NO_WSTRING
 	pSuite->addTest(UnicodeConverterTest::suite());
+#endif
 
 	return pSuite;
 }
diff --git a/Foundation/testsuite/src/UnicodeConverterTest.cpp b/Foundation/testsuite/src/UnicodeConverterTest.cpp
index 62cff7995..f3fec0822 100644
--- a/Foundation/testsuite/src/UnicodeConverterTest.cpp
+++ b/Foundation/testsuite/src/UnicodeConverterTest.cpp
@@ -30,6 +30,9 @@
 //
 
 
+#ifndef POCO_NO_WSTRING
+
+
 #include "Poco/UnicodeConverter.h"
 #include "UnicodeConverterTest.h"
 #include "CppUnit/TestCaller.h"
@@ -86,3 +89,6 @@ CppUnit::Test* UnicodeConverterTest::suite()
 
 	return pSuite;
 }
+
+
+#endif
\ No newline at end of file