diff --git a/test/tap/tests/Makefile b/test/tap/tests/Makefile
index 276f2a961..7e86e5ab4 100644
--- a/test/tap/tests/Makefile
+++ b/test/tap/tests/Makefile
@@ -119,7 +119,7 @@ aurora: aurora.cpp $(TAP_LIBDIR)/libtap.a
 	g++ -DTEST_AURORA -DDEBUG aurora.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl $(STATIC_LIBS) -o aurora -DGITVERSION=\"$(GIT_VERSION)\"
 
 set_testing-t: set_testing-t.cpp $(TAP_LIBDIR)/libtap.a
-	g++ set_testing-t.cpp -Wall $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -pthread -O0 -ggdb -ldl $(STATIC_LIBS) -o set_testing-t
+	g++ set_testing-t.cpp -Wall $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -pthread -ldl $(STATIC_LIBS) -o set_testing-t
 
 test_default_value_transaction_isolation-t: test_default_value_transaction_isolation-t.cpp $(TAP_LIBDIR)/libtap.a
-	g++ test_default_value_transaction_isolation-t.cpp -Wall $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -pthread -O0 -ggdb -ldl -lssl -lcrypto -o test_default_value_transaction_isolation-t
+	g++ test_default_value_transaction_isolation-t.cpp -Wall $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -pthread -ldl $(STATIC_LIBS) -o test_default_value_transaction_isolation-t
diff --git a/test/tap/tests/set_testing-t.cpp b/test/tap/tests/set_testing-t.cpp
index 182a613e4..a6a88a8a2 100644
--- a/test/tap/tests/set_testing-t.cpp
+++ b/test/tap/tests/set_testing-t.cpp
@@ -397,7 +397,7 @@ void * my_conn_thread(void *arg) {
 
 	while(__sync_fetch_and_add(&connect_phase_completed,0) != num_threads) {
 	}
-	MYSQL *mysql;
+	MYSQL *mysql=NULL;
 	json vars;
 	for (j=0; j<queries; j++) {
 		int fr = fastrand();