diff --git a/test/my_result2.c b/test/my_result2.c
index 6104d956..84e97680 100644
--- a/test/my_result2.c
+++ b/test/my_result2.c
@@ -1104,7 +1104,7 @@ DECLARE_TEST(t_bookmark)
 {
   SQLLEN len= 0;
   SQLINTEGER abookmark[4];
-  SQLINTEGER outlen;
+  SQLLEN outlen;
   SQLUSMALLINT rowStatus[4];
   SQLUINTEGER numRowsFetched;
   SQLINTEGER nData[4];
diff --git a/test/odbctap.h b/test/odbctap.h
index 54c117ab..539e4381 100644
--- a/test/odbctap.h
+++ b/test/odbctap.h
@@ -55,6 +55,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <wchar.h>
 
 #ifdef _WIN32
 /* Driver does that - applications should do that too, to have same size of structures */
@@ -597,7 +598,7 @@ do { \
 */
 #define is_wstr(a, b, c) \
 do { \
-  SQLWCHAR *val_a= (a), *val_b= (b); \
+  wchar_t *val_a= (a), *val_b= (b); \
   int val_len= (int)(c); \
   if (memcmp(val_a, val_b, val_len * sizeof(SQLWCHAR)) != 0) { \
     printf("# %s ('%*ls') != '%*ls' in %s on line %d\n", \