diff --git a/tests/ChangeLog b/tests/ChangeLog
index 098afb5..1869651 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-07 Paul Jakma <paul@jakma.org
+
+	* bgp_mp_attr_test.c: MP_(UN)REACH_NLRI unit tests
+
 2008-02-23 Paul Jakma <paul.jakma@sun.com>
 
 	* aspath_test.c: Test for 0-ASN sequences that still have data.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2045496..d00485f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,9 @@
 DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
 
 noinst_PROGRAMS = testsig testbuffer testmemory heavy heavywq heavythread \
-		aspathtest testprivs teststream testbgpcap ecommtest
+		aspathtest testprivs teststream testbgpcap ecommtest \
+		testbgpmpattr
+
 testsig_SOURCES = test-sig.c
 testbuffer_SOURCES = test-buffer.c
 testmemory_SOURCES = test-memory.c
@@ -14,6 +16,7 @@
 aspathtest_SOURCES = aspath_test.c
 testbgpcap_SOURCES = bgp_capability_test.c
 ecommtest_SOURCES = ecommunity_test.c
+testbgpmpattr_SOURCES =  bgp_mp_attr_test.c
 
 testsig_LDADD = ../lib/libzebra.la @LIBCAP@
 testbuffer_LDADD = ../lib/libzebra.la @LIBCAP@
@@ -26,3 +29,4 @@
 aspathtest_LDADD = ../lib/libzebra.la @LIBCAP@ -lm ../bgpd/libbgp.a
 testbgpcap_LDADD = ../lib/libzebra.la @LIBCAP@ -lm ../bgpd/libbgp.a
 ecommtest_LDADD = ../lib/libzebra.la @LIBCAP@ -lm ../bgpd/libbgp.a
+testbgpmpattr_LDADD = ../lib/libzebra.la @LIBCAP@ -lm ../bgpd/libbgp.a