diff --git a/src/connector/odbc/tests/main.c b/src/connector/odbc/tests/main.c
index 1bb174e7b9f6b43ff9c88070667a37cffbb52a1b..2c817f13858d043e12efb50adf36146dbcc4a46c 100644
--- a/src/connector/odbc/tests/main.c
+++ b/src/connector/odbc/tests/main.c
@@ -434,7 +434,9 @@ int test_sqls_in_stmt(SQLHENV env, SQLHDBC conn, SQLHSTMT stmt, const char *sqls
     const char *p = NULL;
     do {
       if (line[0] == '#') break;
-      if (line[n-1] == '\n') line[n-1]='\0';
+      if (n>0 && line[n-1] == '\n') line[n-1]='\0';
+      if (n>0 && line[n-1] == '\r') line[n-1]='\0';
+      if (n>1 && line[n-2] == '\r') line[n-2]='\0';
       p = line;
       while (isspace(*p)) ++p;
 
diff --git a/src/connector/odbc/tests/select.stmts b/src/connector/odbc/tests/select.stmts
new file mode 100644
index 0000000000000000000000000000000000000000..f7152ba6cf59ae2d0af75bba1845f6fb80150a0e
--- /dev/null
+++ b/src/connector/odbc/tests/select.stmts
@@ -0,0 +1,4 @@
+P: select * from db.t;
+P: select * from db.f;
+P: select * from db.v;
+P: select * from db.mt;
\ No newline at end of file