diff --git a/Makefile b/Makefile
index 696a5b7..74a66cc 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ $(ORIG_SRC_TAR): $(BUILDDIR)
 deb: $(DEBS)
 $(OTHER_DEBS) $(DBG_DEBS): $(MAIN_DEB)
 $(MAIN_DEB): $(BUILDDIR)
-	cd $(BUILDDIR); dpkg-buildpackage -b -uc -us --build-profiles="pkg.frr.nortrlib"
+	cd $(BUILDDIR); dpkg-buildpackage -b -uc -us --build-profiles="pkg.frr.nortrlib,pkg.frr.notesttools"
 	lintian $(DEBS)
 
 .PHONY: dsc
diff --git a/debian/control b/debian/control
index 1aeea3d..d02dcf7 100644
--- a/debian/control
+++ b/debian/control
@@ -88,6 +88,15 @@ Description: FRRouting suite - BGP RPKI support (rtrlib)
  number.
 Build-Profiles: <!pkg.frr.nortrlib>
 
+Package: frr-test-tools
+Architecture: linux-any
+Depends: frr (= ${binary:Version}),
+	${misc:Depends},
+	${shlibs:Depends}
+Description: FRRouting suite - Testing Tools
+ Adds FRR test tools, used in testing FRR.
+Build-Profiles: <!pkg.frr.notesttools>
+
 Package: frr-doc
 Section: doc
 Architecture: all
diff --git a/frr b/frr
index 1622c2e..5f0beaa 160000
--- a/frr
+++ b/frr
@@ -1 +1 @@
-Subproject commit 1622c2ece2f68e034b43fb037503514c2195aba5
+Subproject commit 5f0beaa0fdd00b7a60c1765067d1b6fa65ce96c0