diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
index 52519639a..7fc5a5621 100644
--- a/test/testsimplifytokens.cpp
+++ b/test/testsimplifytokens.cpp
@@ -3712,7 +3712,7 @@ private:
             "a . foo ( ) ; "
             "wchar_t c ; c = 0 ; "
             "}";
-        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS(expected, tok(code, false));
     }
 
     void simplifyTypedef2() {
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index f3fca8b69..3ca71a244 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -7236,7 +7236,7 @@ private:
                             "    _stscanf(dst, _T(\"%s\"), dst);"
                             "}"
                             "TBYTE tbyte;";
-        const char expected[] = "unsigned short wc ; "
+        const char expected[] = "wchar_t wc ; "
                                 "char c ; "
                                 "char * ptstr ; "
                                 "char * lptstr ; "
@@ -7282,24 +7282,24 @@ private:
                             "    _tscanf(_T(\"%s\"), dst);"
                             "    _stscanf(dst, _T(\"%s\"), dst);"
                             "}";
-        const char expected[] = "unsigned short wc ; "
-                                "unsigned short c ; "
+        const char expected[] = "wchar_t wc ; "
+                                "wchar_t c ; "
                                 "unsigned short * ptstr ; "
                                 "unsigned short * lptstr ; "
                                 "const unsigned short * pctstr ; "
                                 "const unsigned short * lpctstr ; "
                                 "unsigned char tbyte ; "
                                 "void foo ( ) { "
-                                "unsigned short tc ; tc = \'c\' ; "
-                                "unsigned short src [ 10 ] = \"123456789\" ; "
-                                "unsigned short dst [ 10 ] ; "
+                                "wchar_t tc ; tc = \'c\' ; "
+                                "wchar_t src [ 10 ] = \"123456789\" ; "
+                                "wchar_t dst [ 10 ] ; "
                                 "wcscpy ( dst , src ) ; "
                                 "dst [ 0 ] = 0 ; "
                                 "wcscat ( dst , src ) ; "
                                 "unsigned short * d ; d = wcsdup ( str ) ; "
                                 "wprintf ( \"Hello world!\n\" ) ; "
                                 "swprintf ( dst , \"Hello!\n\" ) ; "
-                                "snwprintf ( dst , sizeof ( dst ) / sizeof ( unsigned short ) , \"Hello world!\n\" ) ; "
+                                "snwprintf ( dst , sizeof ( dst ) / sizeof ( wchar_t ) , \"Hello world!\n\" ) ; "
                                 "wscanf ( \"%s\" , dst ) ; "
                                 "swscanf ( dst , \"%s\" , dst ) ; "
                                 "}";