diff --git a/lvm2.spec b/lvm2.spec
index e47bb1c..9e80342 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -10,6 +10,7 @@
 %global enable_python 1
 %global enable_thin 1
 %global enable_dmfilemapd 1
+%global enable_testsuite 1
 
 %global system_release_version 23
 %global systemd_version 189-3
@@ -180,6 +181,9 @@ make install_system_dirs DESTDIR=$RPM_BUILD_ROOT
 make install_systemd_units DESTDIR=$RPM_BUILD_ROOT
 make install_systemd_generators DESTDIR=$RPM_BUILD_ROOT
 make install_tmpfiles_configuration DESTDIR=$RPM_BUILD_ROOT
+%if %{enable_testsuite}
+make -C test install DESTDIR=$RPM_BUILD_ROOT
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -867,7 +871,28 @@ the device-mapper event library.
 %{_includedir}/libdevmapper-event.h
 %{_libdir}/pkgconfig/devmapper-event.pc
 
+##############################################################################
+# Testsuite
+##############################################################################
+%if %{enable_testsuite}
+%package testsuite
+Summary: LVM2 Testsuite
+License: LGPLv2
+
+%description testsuite
+An extensive functional testsuite for LVM2.
+
+%files testsuite
+%defattr(-,root,root,-)
+%{_datadir}/lvm2-testsuite/
+%{_libexecdir}/lvm2-testsuite/
+%{_bindir}/lvm2-testsuite
+%endif
+
 %changelog
+* Thu Dec 14 2017 Marian Csontos <mcsontos@redhat.com> - 2.02.176-2
+- Add testsuite subpackage.
+
 * Fri Nov 03 2017 Marian Csontos <mcsontos@redhat.com> - 2.02.176-1
 - Fix segfault in lvm_pv_remove in liblvm. (2.02.173)
 - Do not allow storing VG metadata with LV without any segment.
@@ -886,7 +911,7 @@ the device-mapper event library.
 - Move lib code used only by liblvm into metadata-liblvm.c.
 - Distinguish between device not found and excluded by filter.
 - Monitor external origin LVs.
-- Allow lvcreate --type mirror to work with 100%FREE.
+- Allow lvcreate --type mirror to work with 100%%FREE.
 - Improve selection of resource name for complex volume activation lock.
 - Avoid cutting first character of resource name for activation lock.
 - Support for encrypted devices in fsadm.
@@ -1347,7 +1372,7 @@ the device-mapper event library.
 - Fix lvmconfig --type diff to display complete diff if config cascade used.
 - Automatically filter out partitioned loop devices with partscan (losetup -P).
 - Fix lvm devtypes internal error if -S used with field name from pvs/vgs/lvs.
-- When reporting Data%,Snap%,Meta%,Cpy%Sync use single ioctl per LV.
+- When reporting Data%,Snap%,Meta%,Cpy%%Sync use single ioctl per LV.
 - Add lvseg_percent_with_info_and_seg_status() for percent retrieval.
 - Enhance internal seg_status handling to understand snapshots better.
 - When refresh failed in suspend, call resume upon error path.
@@ -1417,7 +1442,7 @@ the device-mapper event library.
 * Mon Apr 11 2016 Peter Rajnoha <prajnoha@redhat.com> - 2.02.150-1
 - Avoid using flushing dm status ioctl when checking for usable DM device.
 - Check for devices without LVM- uuid prefix only with kernels < 3.X.
-- Reuse %FREE size aproximation with lvcreate -l%PVS thin-pool.
+- Reuse %%FREE size aproximation with lvcreate -l%%PVS thin-pool.
 - Allow the lvmdump directory to exist already provided it is empty.
 - Show lvconverted percentage with 2 decimal digits.
 - Fix regression in suspend when repairing --type mirror (2.02.133).
@@ -2249,7 +2274,7 @@ the device-mapper event library.
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
 * Tue Aug 5 2014 Alasdair Kergon <agk@redhat.com> - 2.02.109-1
-- Allow approximate allocation with +%FREE in lvextend.
+- Allow approximate allocation with +%%FREE in lvextend.
 - Fix a segfault in lvscan --cache when devices were already missing. (2.02.108)
 - Display actual size changed when resizing LV.
 - Remove possible spurious "not found" message on PV create before wiping.
@@ -2292,7 +2317,7 @@ the device-mapper event library.
 - Fix use of buildir in make pofile.
 - Enhance private volumes UUIDs with suffixed for easier detection.
 - Do not use reserved _[tc]meta volumes for temporary LVs.
-- Leave backup pool metadata with _meta%d suffix instead of reserved _tmeta%d.
+- Leave backup pool metadata with _meta%%d suffix instead of reserved _tmeta%%d.
 - Allow RAID repair to reuse PVs from same image that suffered a failure.
 - New RAID images now avoid allocation on any PVs in the same parent RAID LV.
 - Always reevaluate filters just before creating PV.
@@ -2321,7 +2346,7 @@ the device-mapper event library.
 - Use dm_report_init_with_selection now, implicit "selected" field appears.
 - Make use of libdm's DM_REPORT_FIELD_TYPE{SIZE,PERCENT,STRING_LIST} for fields.
 - Support all-or-nothing pvmove --atomic.
-- Automatically add snapshot metadata size for -l %ORIGIN calculation.
+- Automatically add snapshot metadata size for -l %%ORIGIN calculation.
 - When converting RAID origin to cache LV, properly rename sub-LVs.
 - Use RemoveOnStop for lvm2-lvmetad.socket systemd unit.
 - Add thin-generic configuration profile for generic thin settings.