diff --git a/Data/MySQL/testsuite/Makefile b/Data/MySQL/testsuite/Makefile
index e6e16465a..d277f27b5 100644
--- a/Data/MySQL/testsuite/Makefile
+++ b/Data/MySQL/testsuite/Makefile
@@ -8,11 +8,10 @@
 
 include $(POCO_BASE)/build/rules/global
 
-INCLUDE += -I./../include -I/usr/local/include/mysql
-SYSLIBS += -L/usr/local/lib/mysql -lmysqlclient -lz
+INCLUDE += -I./../include -I/usr/local/include/mysql -I/usr/include/mysql/ -I/usr/mysql/include/mysql
+SYSLIBS += -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -lmysqlclient -lz
 
-objects = MySQLTestSuite Driver \
-	MySQLTest SQLExecutor
+objects = MySQLTestSuite Driver MySQLTest SQLExecutor
 
 target         = testrunner
 target_version = 1
diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp
index fd873f78a..e8f0d4b10 100644
--- a/Data/MySQL/testsuite/src/SQLExecutor.cpp
+++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp
@@ -267,9 +267,9 @@ void SQLExecutor::bareboneMySQLTest(const char* host, const char* user, const ch
 	rc = mysql_stmt_fetch(hstmt);
 	assert (rc == 0);
 
-			assert (0 == strncmp("111", chr[0], 3));
-			assert (0 == strncmp("222", chr[1], 3));
-			assert (0 == strncmp("333", chr[2], 3));
+			assert (0 == std::strncmp("111", chr[0], 3));
+			assert (0 == std::strncmp("222", chr[1], 3));
+			assert (0 == std::strncmp("333", chr[2], 3));
 			assert (4 == fourth);
 			assert (1.5 == fifth);