diff --git a/.travis.yml b/.travis.yml
index 1bdb184..4521f72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,3 +39,4 @@ script:
   - ./src/util/mdb-tables test/data/nwind.mdb
   - ./src/util/mdb-ver test/data/ASampleDatabase.accdb
   - ./src/util/mdb-ver test/data/nwind.mdb
+  - env MDBPATH=test/data ./src/odbc/unittest
diff --git a/src/odbc/Makefile.am b/src/odbc/Makefile.am
index c5d5c94..d255d23 100644
--- a/src/odbc/Makefile.am
+++ b/src/odbc/Makefile.am
@@ -1,9 +1,13 @@
+AUTOMAKE_OPTIONS = subdir-objects
 noinst_PROGRAMS	=	unittest
 lib_LTLIBRARIES	=	libmdbodbc.la
 AM_CFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS)
 libmdbodbc_la_SOURCES	= odbc.c connectparams.c mdbodbc.h connectparams.h
 libmdbodbc_la_LIBADD	= ../libmdb/libmdb.la ../sql/libmdbsql.la
 libmdbodbc_la_LDFLAGS	= -avoid-version -export-symbols-regex '^(SQL|ODBCINST)'
+if FAKE_GLIB
+libmdbodbc_la_SOURCES += ../libmdb/fakeglib.c
+endif
 if ICONV
 lib_LTLIBRARIES += libmdbodbcW.la
 libmdbodbcW_la_SOURCES	= $(libmdbodbc_la_SOURCES)
diff --git a/src/odbc/unittest.c b/src/odbc/unittest.c
index 9b042cb..8851794 100644
--- a/src/odbc/unittest.c
+++ b/src/odbc/unittest.c
@@ -53,7 +53,7 @@ static void printStatementError(HSTMT hstmt, char *msg)
 }
 
 
-int main()
+int main(int argc, char **argv)
 {
 int i;
 
@@ -111,10 +111,9 @@ int i;
 	}
 
 
-	retcode = SQLConnect(hdbc, 
-				   (UCHAR *)"Northwind", SQL_NTS, 
-				   (UCHAR *)"", SQL_NTS,
-				   (UCHAR *)"", SQL_NTS);
+	retcode = SQLDriverConnect(hdbc, NULL,
+            (UCHAR *)"DBQ=nwind.mdb", SQL_NTS,
+            NULL, 0, NULL, SQL_DRIVER_NOPROMPT);
 	if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
 	{
 		UCHAR  szSqlState[6];