diff --git a/device-mapper.changes b/device-mapper.changes
index 42af0ee..927d1e4 100644
--- a/device-mapper.changes
+++ b/device-mapper.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 10 09:25:17 UTC 2017 - zlliu@suse.com
+
+- add a new test package named lvm2-testsuite bnc#950089
+  * lvm2-testsuite.patch
+
 -------------------------------------------------------------------
 Wed Dec 28 11:08:23 UTC 2016 - tchvatal@suse.com
 
diff --git a/device-mapper.spec b/device-mapper.spec
index f7d085b..00b0d44 100644
--- a/device-mapper.spec
+++ b/device-mapper.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package device-mapper
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -76,6 +76,8 @@ Patch2008:      libdm-iface-not-output-error-message-inside-retry-loop.patch
 Patch2009:      pvcreate-enhance-the-error-message.patch
 # bnc#990538 bnc#986734
 Patch2010:      69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
+#PATCH-FIX-SUSE, bnc#950089
+Patch2011:      lvm2-testsuite.patch
 ### COMMON-PATCH-END ###
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@@ -151,6 +153,7 @@ Files needed for software development using the device mapper
 %patch2008 -p1
 %patch2009 -p1
 %patch2010 -p1
+%patch2011 -p1
 ### COMMON-PREP-END ###
 
 %build
diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes
index 42af0ee..927d1e4 100644
--- a/lvm2-clvm.changes
+++ b/lvm2-clvm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 10 09:25:17 UTC 2017 - zlliu@suse.com
+
+- add a new test package named lvm2-testsuite bnc#950089
+  * lvm2-testsuite.patch
+
 -------------------------------------------------------------------
 Wed Dec 28 11:08:23 UTC 2016 - tchvatal@suse.com
 
diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec
index 095d214..f4da61a 100644
--- a/lvm2-clvm.spec
+++ b/lvm2-clvm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package lvm2-clvm
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -75,6 +75,8 @@ Patch2008:      libdm-iface-not-output-error-message-inside-retry-loop.patch
 Patch2009:      pvcreate-enhance-the-error-message.patch
 # bnc#990538 bnc#986734
 Patch2010:      69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
+#PATCH-FIX-SUSE, bnc#950089
+Patch2011:      lvm2-testsuite.patch
 ### COMMON-PATCH-END ###
 BuildRequires:  libcorosync-devel
 BuildRequires:  libdlm-devel
@@ -135,6 +137,7 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
 %patch2008 -p1
 %patch2009 -p1
 %patch2010 -p1
+%patch2011 -p1
 ### COMMON-PREP-END ###
 
 %build
diff --git a/lvm2-testsuite.patch b/lvm2-testsuite.patch
new file mode 100644
index 0000000..2bc7ff5
--- /dev/null
+++ b/lvm2-testsuite.patch
@@ -0,0 +1,33 @@
+commit 0402acbbb9f8f6066a3f7899e8cc3ae72b84ee20
+Author: Zhilong Liu <zlliu@suse.com>
+Date:   Wed Dec 7 02:43:10 2016 -0500
+
+    add a new test package named lvm2-testsuite(bnc#950089)
+      + lvm2-testsuite.patch
+    Currently this new package is not enabled by default.
+    Please set enable_testsuite to 1 to turn it on in the
+     spec file.
+    
+    Signed-off-by: Zhilong Liu <zlliu@suse.com>
+
+diff --git a/test/Makefile.in b/test/Makefile.in
+index f152868..f0845d7 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -224,7 +224,7 @@ install: .tests-stamp lib/paths-installed
+ 	$(INSTALL_DATA) shell/*.sh $(DATADIR)/shell
+ 	$(INSTALL_DATA) api/*.sh $(DATADIR)/api
+ 	$(INSTALL_DATA) lib/mke2fs.conf $(DATADIR)/lib
+-	$(INSTALL_PROGRAM) api/*.{t,py} $(DATADIR)/api
++	$(INSTALL_PROGRAM) api/*.py $(DATADIR)/api/
+ 	$(INSTALL_PROGRAM) dbus/*.py $(DATADIR)/dbus/
+ 	$(INSTALL_DATA) lib/paths-installed $(DATADIR)/lib/paths
+ 	cd lib && $(INSTALL_DATA) \
+@@ -244,6 +244,7 @@ install: .tests-stamp lib/paths-installed
+ 	@cd $(EXECDIR) && for i in $(LIB_LINK_NOT); do \
+ 		echo "$(LN_S) -f not $$i"; \
+ 		$(LN_S) -f not $$i; done
++	$(INSTALL_PROGRAM) api/*.t $(EXECDIR)
+ 	$(INSTALL_PROGRAM) -D lib/runner $(bindir)/lvm2-testsuite
+ 
+ lib/should: lib/not
diff --git a/lvm2.changes b/lvm2.changes
index 42af0ee..927d1e4 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 10 09:25:17 UTC 2017 - zlliu@suse.com
+
+- add a new test package named lvm2-testsuite bnc#950089
+  * lvm2-testsuite.patch
+
 -------------------------------------------------------------------
 Wed Dec 28 11:08:23 UTC 2016 - tchvatal@suse.com
 
diff --git a/lvm2.spec b/lvm2.spec
index 155ad4d..44ff5d5 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package lvm2
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -77,6 +77,8 @@ Patch2008:      libdm-iface-not-output-error-message-inside-retry-loop.patch
 Patch2009:      pvcreate-enhance-the-error-message.patch
 # bnc#990538 bnc#986734
 Patch2010:      69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
+#PATCH-FIX-SUSE, bnc#950089
+Patch2011:      lvm2-testsuite.patch
 ### COMMON-PATCH-END ###
 BuildRequires:  gcc-c++
 BuildRequires:  libaio-devel
@@ -128,6 +130,16 @@ Recommends:     device-mapper-devel
 %description devel
 This package provides development files for the LVM2 Logical Volume Manager.
 
+%package testsuite
+Summary:        LVM2 Testsuite
+Group:          Development/Libraries/C and C++
+Requires:       %{applib} = %{version}
+Requires:       %{cmdlib} = %{version}
+Requires:       lvm2 = %{version}
+
+%description testsuite
+An extensive functional testsuite for the LVM2 Logical Volume Manager.
+
 %prep
 %setup -q -n LVM2.%{version}
 ### COMMON-PREP-BEGIN ###
@@ -160,6 +172,7 @@ This package provides development files for the LVM2 Logical Volume Manager.
 %patch2008 -p1
 %patch2009 -p1
 %patch2010 -p1
+%patch2011 -p1
 ### COMMON-PREP-END ###
 
 %build
@@ -206,6 +219,8 @@ make install_systemd_generators DESTDIR=%{buildroot}
 make install_tmpfiles_configuration DESTDIR=%{buildroot}
 # Install configuration file
 install -m 644 %{SOURCE1} "%{buildroot}/%{_sysconfdir}/lvm/"
+# Install testsuite
+make -C test install DESTDIR=%{buildroot}
 
 pushd "%{buildroot}/%{_libdir}"
 ln -sf liblvm2cmd.so.2.02 liblvm2cmd.so
@@ -256,7 +271,7 @@ popd
 %{?regenerate_initrd_post}
 %service_add_post blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket lvm2-lvmetad.service
 # Use %%tmpfiles_create when 13.2 is oldest in support scope
-/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/lvm2.conf || :
+%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/lvm2.conf || :
 
 %posttrans
 %{?regenerate_initrd_posttrans}
@@ -317,9 +332,9 @@ popd
 %{_libdir}/libdevmapper-event-lvm2*.so
 %{_libdir}/libdevmapper-event-lvm2*.so.2.02
 %{_libdir}/libdevmapper-event-lvm2.so
-%{_mandir}/man5/lvm.conf.5.*
-%{_mandir}/man8/blkdeactivate.8.*
-%{_mandir}/man8/fsadm.8.gz
+%{_mandir}/man5/lvm.conf.5%{ext_man}
+%{_mandir}/man8/blkdeactivate.8%{ext_man}
+%{_mandir}/man8/fsadm.8%{ext_man}
 %{_mandir}/man8/lv*.8*
 %{_mandir}/man8/pv*.8*
 %{_mandir}/man8/vg*.8*
@@ -335,4 +350,10 @@ popd
 %{_libdir}/liblvm2app.so
 %{_libdir}/liblvm2cmd.so
 
+%files testsuite
+%defattr(-,root,root,-)
+%{_datarootdir}/lvm2-testsuite/
+%{_libexecdir}/lvm2-testsuite/
+%{_bindir}/lvm2-testsuite
+
 %changelog