diff --git a/_multibuild b/_multibuild
index 23c6f50..9787c35 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,5 +1,7 @@
 <multibuild>
   <package>testsuite</package>
   <package>psm</package>
+  <package>psm-testsuite</package>
   <package>psm2</package>
+  <package>psm2-testsuite</package>
 </multibuild>
diff --git a/mvapich2.changes b/mvapich2.changes
index c704cce..4d3a34d 100644
--- a/mvapich2.changes
+++ b/mvapich2.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Sep 12 09:25:01 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Drop unnecessary dependency to xorg-x11-devel
+
+-------------------------------------------------------------------
+Mon Sep 11 09:19:37 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Only requires verbs libraries for verbs build.
+  libibverbs devel causes a SEGV when run in a chroot using the
+  psm or psm2 conduits
+- Add testuite packages for all build flavours
+
 -------------------------------------------------------------------
 Thu Jul 13 14:59:13 UTC 2017 - nmoreychaisemartin@suse.com
 
diff --git a/mvapich2.spec b/mvapich2.spec
index 2ccb860..8d71dc4 100644
--- a/mvapich2.spec
+++ b/mvapich2.spec
@@ -18,16 +18,36 @@
 
 %global flavor @BUILD_FLAVOR@%nil
 
+%if "%{flavor}" == ""
+%define build_flavor verbs
+%endif
+%if "%{flavor}" == "testsuite"
+%define build_flavor verbs
+%define testsuite 1
+%endif
+
+%if "%{flavor}" == "psm"
+%define build_flavor psm
+%endif
+%if "%{flavor}" == "psm-testsuite"
+%define build_flavor psm
+%define testsuite 1
+%endif
+
+%if "%{flavor}" == "psm2"
+%define build_flavor psm2
+%endif
+%if "%{flavor}" == "psm2-testsuite"
+%define build_flavor psm2
+%define testsuite 1
+%endif
+
 %if "%{flavor}" != ""
 %define pack_suff -%{flavor}
 %else
 %define pack_suff %{nil}
 %endif
 
-%if "%flavor" == "testsuite"
-%define testsuite 1
-%endif
-
 %define module_name mvapich2%{pack_suff}
 %define _prefix /usr/%_lib/mpi/gcc/%{module_name}
 %define _libexecdir %{_prefix}/%{_lib}
@@ -56,10 +76,6 @@ BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-fortran
-BuildRequires:  infiniband-diags-devel
-BuildRequires:  libibumad-devel
-BuildRequires:  libibverbs-devel
-BuildRequires:  librdmacm-devel
 %ifnarch s390 s390x armv7hl
 BuildRequires:  libnuma-devel
 %endif
@@ -68,15 +84,20 @@ BuildRequires:  libtool
 BuildRequires:  mpi-selector
 BuildRequires:  python-devel
 BuildRequires:  sysfsutils
-BuildRequires:  xorg-x11-devel
-%if "%{flavor}" == "psm"
+%if "%{build_flavor}" == "psm"
 ExclusiveArch:  %ix86 x86_64
 BuildRequires:  infinipath-psm-devel
 %endif
-%if "%{flavor}" == "psm2"
+%if "%{build_flavor}" == "psm2"
 ExclusiveArch:  x86_64
 BuildRequires:  libpsm2-devel
 %endif
+%if "%{build_flavor}" == "verbs"
+BuildRequires:  infiniband-diags-devel
+BuildRequires:  libibumad-devel
+BuildRequires:  libibverbs-devel
+BuildRequires:  librdmacm-devel
+%endif
 
 Requires:       mpi-selector
 
@@ -90,14 +111,16 @@ is based on MPICH2 and MVICH.
 Summary:        OSU MVAPICH2 MPI package
 Group:          Development/Libraries/Parallel
 Requires:       %{name} = %{version}
+%if "%{build_flavor}" == "psm"
+Requires:       infinipath-psm-devel
+%endif
+%if "%{build_flavor}" == "psm2"
+Requires:       libpsm2-devel
+%endif
+%if "%{build_flavor}" == "verbs"
 Requires:       libibumad-devel
 Requires:       libibverbs-devel
 Requires:       librdmacm-devel
-%if "%{flavor}" == "psm"
-Requires:       infinipath-psm-devel
-%endif
-%if "%{flavor}" == "psm2"
-Requires:       libpsm2-devel
 %endif
 
 %description devel
@@ -128,11 +151,11 @@ cp /usr/share/automake*/config.* .
 #./autogen.sh
 %configure \
    --disable-wrapper-rpath      \
-%if "%{flavor}" == "psm"
+%if "%{build_flavor}" == "psm"
    --with-device=ch3:psm \
    --with-psm=/usr \
 %endif
-%if "%{flavor}" == "psm2"
+%if "%{build_flavor}" == "psm2"
    --with-device=ch3:psm \
    --with-psm2=/usr \
 %endif