diff --git a/testing/btest/Baseline/scripts.base.protocols.dhcp.dhcp-ack-msg-types/dhcp.log b/testing/btest/Baseline/scripts.base.protocols.dhcp.dhcp-ack-msg-types/dhcp.log
new file mode 100644
index 0000000000..1edaec49ee
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.protocols.dhcp.dhcp-ack-msg-types/dhcp.log
@@ -0,0 +1,10 @@
+#separator \x09
+#set_separator	,
+#empty_field	(empty)
+#unset_field	-
+#path	dhcp
+#open	2018-01-08-17-58-31
+#fields	ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	mac	assigned_ip	lease_time	trans_id	msg_type	client_id	server_id	host_name	subscriber_id	agent_remote_id
+#types	time	string	addr	port	addr	port	string	addr	interval	count	string	string	addr	string	string	string
+1102274184.387798	CHhAvVGS1DHFjwGM9	10.10.0.10	68	10.10.0.1	67	00:0a:28:00:fa:42	192.168.0.10	3600.000000	15633	DHCP_ACK	-	10.10.0.1	(empty)	-subID-	13
+#close	2018-01-08-17-58-31
diff --git a/testing/btest/Baseline/scripts.base.protocols.dhcp.dhcp-discover-msg-types/dhcp.log b/testing/btest/Baseline/scripts.base.protocols.dhcp.dhcp-discover-msg-types/dhcp.log
new file mode 100644
index 0000000000..13e87b3855
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.protocols.dhcp.dhcp-discover-msg-types/dhcp.log
@@ -0,0 +1,10 @@
+#separator \x09
+#set_separator	,
+#empty_field	(empty)
+#unset_field	-
+#path	dhcp
+#open	2018-01-08-17-58-41
+#fields	ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	mac	assigned_ip	lease_time	trans_id	msg_type	client_id	server_id	host_name	subscriber_id	agent_remote_id
+#types	time	string	addr	port	addr	port	string	addr	interval	count	string	string	addr	string	string	string
+1102274184.317453	CHhAvVGS1DHFjwGM9	0.0.0.0	68	255.255.255.255	67	-	-	-	15633	DHCP_DISCOVER	00:0b:82:01:fc:42	-	test0000	-	-
+#close	2018-01-08-17-58-41
diff --git a/testing/btest/Traces/dhcp/dhcp_ack_subscriber_id_and_agent_remote_id.trace b/testing/btest/Traces/dhcp/dhcp_ack_subscriber_id_and_agent_remote_id.trace
new file mode 100644
index 0000000000..b5e72d4735
Binary files /dev/null and b/testing/btest/Traces/dhcp/dhcp_ack_subscriber_id_and_agent_remote_id.trace differ
diff --git a/testing/btest/Traces/dhcp/dhcp_discover_param_req_and_client_id.trace b/testing/btest/Traces/dhcp/dhcp_discover_param_req_and_client_id.trace
new file mode 100644
index 0000000000..bfdbb54c01
Binary files /dev/null and b/testing/btest/Traces/dhcp/dhcp_discover_param_req_and_client_id.trace differ
diff --git a/testing/btest/scripts/base/protocols/dhcp/dhcp-ack-msg-types.btest b/testing/btest/scripts/base/protocols/dhcp/dhcp-ack-msg-types.btest
new file mode 100644
index 0000000000..8f192b7aa4
--- /dev/null
+++ b/testing/btest/scripts/base/protocols/dhcp/dhcp-ack-msg-types.btest
@@ -0,0 +1,6 @@
+# This tests that DHCP leases are logged in dhcp.log
+# The trace has a message of each DHCP message type,
+# but only one lease should show up in the logs.
+
+# @TEST-EXEC: bro -r $TRACES/dhcp/dhcp_ack_subscriber_id_and_agent_remote_id.trace %INPUT
+# @TEST-EXEC: btest-diff dhcp.log
diff --git a/testing/btest/scripts/base/protocols/dhcp/dhcp-discover-msg-types.btest b/testing/btest/scripts/base/protocols/dhcp/dhcp-discover-msg-types.btest
new file mode 100644
index 0000000000..1952682e61
--- /dev/null
+++ b/testing/btest/scripts/base/protocols/dhcp/dhcp-discover-msg-types.btest
@@ -0,0 +1,6 @@
+# This tests that DHCP leases are logged in dhcp.log
+# The trace has a message of each DHCP message type,
+# but only one lease should show up in the logs.
+
+# @TEST-EXEC: bro -r $TRACES/dhcp/dhcp_discover_param_req_and_client_id.trace %INPUT
+# @TEST-EXEC: btest-diff dhcp.log