diff --git a/testing/btest/Baseline/scripts.base.protocols.mysql.auth/mysql.log b/testing/btest/Baseline/scripts.base.protocols.mysql.auth/mysql.log
new file mode 100644
index 0000000000..6c9e26b441
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.protocols.mysql.auth/mysql.log
@@ -0,0 +1,20 @@
+#separator \x09
+#set_separator	,
+#empty_field	(empty)
+#unset_field	-
+#path	mysql
+#open	2014-09-05-02-09-40
+#fields	ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	cmd	arg	result	response
+#types	time	string	addr	port	addr	port	string	string	string	string
+1362452327.618353	CsRx2w45OKnoww6xl4	192.168.1.3	55845	192.168.1.8	3306	login	root_nope	error	Access denied for user 'root_nope'@'lumberjack.home' (using password: NO)
+1362452330.947463	CRJuHdVW0XPVINV8a	192.168.1.3	55846	192.168.1.8	3306	login	root_nope	error	Access denied for user 'root_nope'@'lumberjack.home' (using password: YES)
+1362452332.571339	CPbrpk1qSsw6ESzHV4	192.168.1.3	55847	192.168.1.8	3306	login	root_nope	error	Access denied for user 'root_nope'@'lumberjack.home' (using password: YES)
+1362452334.559420	C6pKV8GSxOnSLghOa	192.168.1.3	55857	192.168.1.8	3306	login	root_nope	error	Access denied for user 'root_nope'@'lumberjack.home' (using password: YES)
+1362452336.361958	CIPOse170MGiRM1Qf4	192.168.1.3	55860	192.168.1.8	3306	login	root_nope	error	Access denied for user 'root_nope'@'lumberjack.home' (using password: YES)
+1362452357.320858	C7XEbhP654jzLoe3a	192.168.1.3	55861	192.168.1.8	3306	login	root	error	Access denied for user 'root'@'lumberjack.home' (using password: NO)
+1362452358.565340	CJ3xTn1c4Zw9TmAE05	192.168.1.3	55862	192.168.1.8	3306	login	root	error	Access denied for user 'root'@'lumberjack.home' (using password: YES)
+1362452360.410803	CMXxB5GvmoxJFXdTa	192.168.1.3	55863	192.168.1.8	3306	login	root	error	Access denied for user 'root'@'lumberjack.home' (using password: YES)
+1362452361.886123	Caby8b1slFea8xwSmb	192.168.1.3	55864	192.168.1.8	3306	login	root	error	Access denied for user 'root'@'lumberjack.home' (using password: YES)
+1362452372.452858	Che1bq3i2rO3KD1Syg	192.168.1.3	55865	192.168.1.8	3306	login	root	ok	Affected rows: 0
+1362452372.454995	Che1bq3i2rO3KD1Syg	192.168.1.3	55865	192.168.1.8	3306	query	select @@version_comment limit 1	ok	Affected rows: 1
+#close	2014-09-05-02-09-40
diff --git a/testing/btest/Traces/mysql/auth.trace b/testing/btest/Traces/mysql/auth.trace
new file mode 100644
index 0000000000..48072e8020
Binary files /dev/null and b/testing/btest/Traces/mysql/auth.trace differ
diff --git a/testing/btest/Traces/mysql/mysql.trace b/testing/btest/Traces/mysql/mysql.trace
new file mode 100644
index 0000000000..bfc4d794db
Binary files /dev/null and b/testing/btest/Traces/mysql/mysql.trace differ
diff --git a/testing/btest/core/leaks/mysql.test b/testing/btest/core/leaks/mysql.test
new file mode 100644
index 0000000000..363e3069fd
--- /dev/null
+++ b/testing/btest/core/leaks/mysql.test
@@ -0,0 +1,10 @@
+# Needs perftools support.
+#
+# @TEST-REQUIRES: bro  --help 2>&1 | grep -q mem-leaks
+#
+# @TEST-GROUP: leaks
+#
+# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro bro -b -m -r $TRACES/mysql/mysql.trace %INPUT
+# @TEST-EXEC: btest-bg-wait 30
+
+@load base/protocols/mysql
diff --git a/testing/btest/scripts/base/protocols/mysql/auth.test b/testing/btest/scripts/base/protocols/mysql/auth.test
new file mode 100644
index 0000000000..6c764e496f
--- /dev/null
+++ b/testing/btest/scripts/base/protocols/mysql/auth.test
@@ -0,0 +1,6 @@
+# This tests that successful/unsuccesful auth attempts get logged correctly
+
+# @TEST-EXEC: bro -b -r $TRACES/mysql/auth.trace %INPUT
+# @TEST-EXEC: btest-diff mysql.log
+
+@load base/protocols/mysql
\ No newline at end of file