diff --git a/tests/.fmf/version b/.fmf/version
similarity index 100%
rename from tests/.fmf/version
rename to .fmf/version
diff --git a/.gitignore b/.gitignore
index 3bea72e..c297b30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,6 @@ multipath-tools-091027.tar.gz
 /multipath-tools-0.9.7.tgz
 /multipath-tools-0.9.8.tgz
 /multipath-tools-0.9.9.tgz
+/multipath-tools-0.10.0.tgz
+/multipath-tools-0.11.1.tgz
+/multipath-tools-0.13.0.tgz
diff --git a/0001-RH-fixup-udev-rules-for-redhat.patch b/0001-RH-fixup-udev-rules-for-redhat.patch
index d78919e..ed5b7e9 100644
--- a/0001-RH-fixup-udev-rules-for-redhat.patch
+++ b/0001-RH-fixup-udev-rules-for-redhat.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 64a07df23affd21842fdc604887276e62e5b41de Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Thu, 13 Apr 2017 07:22:23 -0500
 Subject: [PATCH] RH: fixup udev rules for redhat
@@ -9,13 +9,13 @@ different naming scheme for partitions than SuSE.
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
- Makefile.inc        | 2 +-
- kpartx/kpartx.rules | 2 +-
- multipath/Makefile  | 4 ++--
+ Makefile.inc           | 2 +-
+ kpartx/kpartx.rules.in | 2 +-
+ multipath/Makefile     | 4 ++--
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.inc b/Makefile.inc
-index 81b86cd8..33dbb99c 100644
+index 9e3dc466..ead89030 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
 @@ -34,7 +34,7 @@ endif
@@ -27,16 +27,16 @@ index 81b86cd8..33dbb99c 100644
  # Prefix for non-essential libraries (libdmmp)
  usr_prefix	:= $(if $(prefix),$(prefix),/usr)
  # Prefix for configuration files (multipath.conf)
-diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
-index 8dd3369c..7c3c7524 100644
---- a/kpartx/kpartx.rules
-+++ b/kpartx/kpartx.rules
+diff --git a/kpartx/kpartx.rules.in b/kpartx/kpartx.rules.in
+index 9d879609..2049eb8f 100644
+--- a/kpartx/kpartx.rules.in
++++ b/kpartx/kpartx.rules.in
 @@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end"
  GOTO="kpartx_end"
  
  LABEL="run_kpartx"
--RUN+="/sbin/kpartx -un -p -part /dev/$name"
-+RUN+="/sbin/kpartx -un /dev/$name"
+-RUN+="@BINDIR@/kpartx -un -p -part /dev/$name"
++RUN+="@BINDIR@/kpartx -un /dev/$name"
  
  LABEL="kpartx_end"
 diff --git a/multipath/Makefile b/multipath/Makefile
diff --git a/0002-RH-Remove-the-property-blacklist-exception-builtin.patch b/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
index b039539..b8e580a 100644
--- a/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
+++ b/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From f7be16ac9fce97585a4552d49f3d3c54a93c9c17 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Wed, 2 Jul 2014 12:49:53 -0500
 Subject: [PATCH] RH: Remove the property blacklist exception builtin
@@ -19,7 +19,7 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  3 files changed, 10 insertions(+), 13 deletions(-)
 
 diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
-index 75100b20..0b212078 100644
+index 17e1b54a..10d13e98 100644
 --- a/libmultipath/blacklist.c
 +++ b/libmultipath/blacklist.c
 @@ -230,8 +230,6 @@ setup_default_blist (struct config * conf)
@@ -42,10 +42,10 @@ index 75100b20..0b212078 100644
  				udev_device_get_properties_list_entry(udev)) {
  
 diff --git a/multipath/multipath.conf.5.in b/multipath/multipath.conf.5.in
-index dacb9b0e..645e8f88 100644
+index 3c9ae097..ba291e11 100644
 --- a/multipath/multipath.conf.5.in
 +++ b/multipath/multipath.conf.5.in
-@@ -1468,9 +1468,14 @@ keywords. Both are regular expressions. For a full description of these keywords
+@@ -1470,9 +1470,14 @@ keywords. Both are regular expressions. For a full description of these keywords
  Regular expression for an udev property. All
  devices that have matching udev properties will be excluded/included.
  The handling of the \fIproperty\fR keyword is special,
@@ -61,7 +61,7 @@ index dacb9b0e..645e8f88 100644
  .
  .RS
  .PP
-@@ -1481,10 +1486,6 @@ Blacklisting by missing properties is only applied to devices which do have the
+@@ -1483,10 +1488,6 @@ Blacklisting by missing properties is only applied to devices which do have the
  property specified by \fIuid_attribute\fR (e.g. \fIID_SERIAL\fR)
  set. Previously, it was applied to every device, possibly causing devices to be
  blacklisted because of temporary I/O error conditions.
@@ -73,10 +73,10 @@ index dacb9b0e..645e8f88 100644
  .TP
  .B protocol
 diff --git a/tests/blacklist.c b/tests/blacklist.c
-index ba8dfd07..693db3fa 100644
+index ab3da619..52ae03e0 100644
 --- a/tests/blacklist.c
 +++ b/tests/blacklist.c
-@@ -384,9 +384,8 @@ static void test_property_missing(void **state)
+@@ -371,9 +371,8 @@ static void test_property_missing(void **state)
  {
  	static struct udev_device udev = { "sdb", { "ID_FOO", "ID_BAZ", "ID_BAR", "ID_SERIAL", NULL } };
  	conf.blist_property = blist_property_wwn;
@@ -87,7 +87,7 @@ index ba8dfd07..693db3fa 100644
  	assert_int_equal(filter_property(&conf, &udev, 3, "ID_BLAH"),
  			 MATCH_NOTHING);
  	assert_int_equal(filter_property(&conf, &udev, 3, ""),
-@@ -478,9 +477,7 @@ static void test_filter_path_missing1(void **state)
+@@ -465,9 +464,7 @@ static void test_filter_path_missing1(void **state)
  	conf.blist_device = blist_device_foo_bar;
  	conf.blist_protocol = blist_protocol_fcp;
  	conf.blist_wwid = blist_wwid_xyzzy;
diff --git a/0003-RH-don-t-start-without-a-config-file.patch b/0003-RH-don-t-start-without-a-config-file.patch
index 267ffa7..05d4e7a 100644
--- a/0003-RH-don-t-start-without-a-config-file.patch
+++ b/0003-RH-don-t-start-without-a-config-file.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 5613e07ce9cabf2fdc402f6f102cc54bd1059800 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Wed, 15 Oct 2014 10:39:30 -0500
 Subject: [PATCH] RH: don't start without a config file
@@ -18,14 +18,14 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  multipath/multipath.rules.in     |  1 +
  multipathd/multipathd.8.in       |  2 ++
  multipathd/multipathd.service.in |  1 +
- multipathd/multipathd.socket     |  1 +
+ multipathd/multipathd.socket.in  |  1 +
  7 files changed, 25 insertions(+)
 
 diff --git a/libmultipath/config.c b/libmultipath/config.c
-index 83fa7369..002027a7 100644
+index 8b424d18..b8317f4d 100644
 --- a/libmultipath/config.c
 +++ b/libmultipath/config.c
-@@ -959,6 +959,19 @@ int _init_config (const char *file, struct config *conf)
+@@ -937,6 +937,19 @@ int init_config__ (const char *file, struct config *conf)
  		}
  		factorize_hwtable(conf->hwtable, builtin_hwtable_size, file);
  		validate_pctable(conf->overrides, 0, file);
@@ -46,7 +46,7 @@ index 83fa7369..002027a7 100644
  
  	conf->processed_main_config = 1;
 diff --git a/libmultipath/config.h b/libmultipath/config.h
-index 384193ab..158cebf0 100644
+index 5b4ebf8c..2302eacc 100644
 --- a/libmultipath/config.h
 +++ b/libmultipath/config.h
 @@ -10,6 +10,7 @@
@@ -58,10 +58,10 @@ index 384193ab..158cebf0 100644
  enum devtypes {
  	DEV_NONE,
 diff --git a/multipath/main.c b/multipath/main.c
-index ce702e7f..c21e3e0b 100644
+index f2adcdeb..31012874 100644
 --- a/multipath/main.c
 +++ b/multipath/main.c
-@@ -842,11 +842,14 @@ main (int argc, char *argv[])
+@@ -834,11 +834,14 @@ main (int argc, char *argv[])
  	char *dev = NULL;
  	struct config *conf;
  	bool enable_foreign = false;
@@ -76,7 +76,7 @@ index ce702e7f..c21e3e0b 100644
  	if (init_config(DEFAULT_CONFIGFILE))
  		exit(RTVL_FAIL);
  	if (atexit(uninit_config))
-@@ -1097,6 +1100,9 @@ main (int argc, char *argv[])
+@@ -1092,6 +1095,9 @@ main (int argc, char *argv[])
  	while ((r = configure(conf, cmd, dev_type, dev)) == RTVL_RETRY)
  		condlog(3, "restart multipath configuration process");
  
@@ -87,7 +87,7 @@ index ce702e7f..c21e3e0b 100644
  	put_multipath_config(conf);
  	if (dev)
 diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in
-index 780bf852..2c518378 100644
+index 2ac1972f..cc248231 100644
 --- a/multipath/multipath.rules.in
 +++ b/multipath/multipath.rules.in
 @@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath"
@@ -99,7 +99,7 @@ index 780bf852..2c518378 100644
  ENV{DEVTYPE}!="partition", GOTO="test_dev"
  IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH"
 diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in
-index 7bc8806e..315884eb 100644
+index 8815e099..342e363e 100644
 --- a/multipathd/multipathd.8.in
 +++ b/multipathd/multipathd.8.in
 @@ -49,6 +49,8 @@ map regains its maximum performance and redundancy.
@@ -112,10 +112,10 @@ index 7bc8806e..315884eb 100644
  .
  .\" ----------------------------------------------------------------------------
 diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in
-index a63ddd9a..01ceff7d 100644
+index eb58943c..ab166435 100644
 --- a/multipathd/multipathd.service.in
 +++ b/multipathd/multipathd.service.in
-@@ -6,6 +6,7 @@ Wants=systemd-udevd-kernel.socket @MODPROBE_UNIT@
+@@ -6,6 +6,7 @@ Wants=systemd-udevd-kernel.socket multipathd-queueing.service @MODPROBE_UNIT@
  After=systemd-udevd-kernel.socket @MODPROBE_UNIT@
  After=multipathd.socket systemd-remount-fs.service
  Before=initrd-cleanup.service
@@ -123,10 +123,10 @@ index a63ddd9a..01ceff7d 100644
  DefaultDependencies=no
  Conflicts=shutdown.target
  Conflicts=initrd-cleanup.service
-diff --git a/multipathd/multipathd.socket b/multipathd/multipathd.socket
-index 6a62f5fd..263b6b0c 100644
---- a/multipathd/multipathd.socket
-+++ b/multipathd/multipathd.socket
+diff --git a/multipathd/multipathd.socket.in b/multipathd/multipathd.socket.in
+index 11002fce..5ed24757 100644
+--- a/multipathd/multipathd.socket.in
++++ b/multipathd/multipathd.socket.in
 @@ -1,6 +1,7 @@
  [Unit]
  Description=multipathd control socket
diff --git a/0004-RH-Fix-nvme-function-missing-argument.patch b/0004-RH-Fix-nvme-function-missing-argument.patch
index ced7159..33a8d5f 100644
--- a/0004-RH-Fix-nvme-function-missing-argument.patch
+++ b/0004-RH-Fix-nvme-function-missing-argument.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 283b5dd645663a2cf16f2813581772d7a84db6ad Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Fri, 25 Jan 2019 14:54:56 -0600
 Subject: [PATCH] RH: Fix nvme function missing argument
@@ -12,10 +12,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libmultipath/nvme/argconfig.h b/libmultipath/nvme/argconfig.h
-index adb192b6..bfd10ef8 100644
+index b3caa7be..f91504c9 100644
 --- a/libmultipath/nvme/argconfig.h
 +++ b/libmultipath/nvme/argconfig.h
-@@ -76,7 +76,7 @@ struct argconfig_commandline_options {
+@@ -63,7 +63,7 @@ struct argconfig_commandline_options {
  extern "C" {
  #endif
  
diff --git a/0005-RH-use-rpm-optflags-if-present.patch b/0005-RH-use-rpm-optflags-if-present.patch
index 0f354e7..7a6f57f 100644
--- a/0005-RH-use-rpm-optflags-if-present.patch
+++ b/0005-RH-use-rpm-optflags-if-present.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From bf46f8029998498045bb055415ba3ff515c79eaa Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Wed, 19 Apr 2017 06:10:01 -0500
 Subject: [PATCH] RH: use rpm optflags if present
@@ -9,19 +9,18 @@ still being generic.
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
- Makefile.inc | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
+ Makefile.inc | 25 ++++++++++++++++++-------
+ 1 file changed, 18 insertions(+), 7 deletions(-)
 
 diff --git a/Makefile.inc b/Makefile.inc
-index 33dbb99c..94e0ec85 100644
+index ead89030..03aee175 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -95,11 +95,23 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
+@@ -102,17 +102,29 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
  MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \
  			echo "modprobe@dm_multipath.service")
  
 -OPTFLAGS	:= -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
--WARNFLAGS	:= -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
 +ifndef RPM_OPT_FLAGS
 +	OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 \
 +		    -Wall $(FORTIFY_OPT) -fexceptions -grecord-gcc-switches \
@@ -35,16 +34,29 @@ index 33dbb99c..94e0ec85 100644
 +else
 +	OPTFLAGS := $(RPM_OPT_FLAGS) --param=ssp-buffer-size=4
 +endif
-+WARNFLAGS	:= -Werror -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
- 		  -Werror=implicit-function-declaration -Werror=format-security \
--		  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS)
+ 
+ # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development.
+ WARN_ONLY       :=
+ ERROR           := $(if $(WARN_ONLY),,error=)
+ WERROR          := $(if $(WARN_ONLY),,-Werror)
+-WARNFLAGS	:= $(WERROR) -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -W$(ERROR)implicit-int \
++WARNFLAGS	:= $(WERROR) -Wextra -Wformat=2 $(WFORMATOVERFLOW) -W$(ERROR)implicit-int \
+ 		  -W$(ERROR)implicit-function-declaration -W$(ERROR)format-security \
+-		  $(WNOCLOBBERED) -W$(ERROR)cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS)
++		  $(WNOCLOBBERED) -W$(ERROR)cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS) -Wstrict-prototypes
+ 
 -CPPFLAGS	:= $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
-+		  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS) -Wstrict-prototypes
 +CPPFLAGS	:= $(CPPFLAGS) $(D_URCU_VERSION) \
  		   -D_FILE_OFFSET_BITS=64 \
  		   -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(TGTDIR)$(plugindir)\" \
  		   -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(TGTDIR)$(configdir)\" \
-@@ -109,7 +121,7 @@ CFLAGS		:= -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
+@@ -121,12 +133,11 @@ CPPFLAGS	:= $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
+ 		   -DABSTRACT_SOCKET=\"$(abstract_socket)\" -DPATHNAME_SOCKET=\"$(pathname_socket)\" \
+ 		   -DWSTRINGOP_TRUNCATION=$(if $(WSTRINGOP_TRUNCATION),1,0) \
+ 		   -MMD -MP
+-CFLAGS		:= -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
+-		   -fexceptions
++CFLAGS		:= -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
  BIN_CFLAGS	:= -fPIE -DPIE
  LIB_CFLAGS	:= -fPIC
  SHARED_FLAGS	:= -shared
diff --git a/0006-RH-add-mpathconf.patch b/0006-RH-add-mpathconf.patch
index fd65e34..46f1126 100644
--- a/0006-RH-add-mpathconf.patch
+++ b/0006-RH-add-mpathconf.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 29e5c6d6e2177e73d1be2ed2af66c1007487bf60 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Thu, 16 Oct 2014 15:49:01 -0500
 Subject: [PATCH] RH: add mpathconf
@@ -13,19 +13,44 @@ a single command.
 Co-authored-by: Paul Donohue <git@PaulSD.com>
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
- libmultipath/config.c |   2 +
- multipath/Makefile    |   4 +
- multipath/mpathconf   | 658 ++++++++++++++++++++++++++++++++++++++++++
- multipath/mpathconf.8 | 151 ++++++++++
- 4 files changed, 815 insertions(+)
+ .github/actions/spelling/expect.txt |   3 +
+ libmultipath/config.c               |   2 +
+ multipath/Makefile                  |   4 +
+ multipath/mpathconf                 | 658 ++++++++++++++++++++++++++++
+ multipath/mpathconf.8               | 151 +++++++
+ 5 files changed, 818 insertions(+)
  create mode 100644 multipath/mpathconf
  create mode 100644 multipath/mpathconf.8
 
+diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
+index a5856bcc..5c9113ba 100644
+--- a/.github/actions/spelling/expect.txt
++++ b/.github/actions/spelling/expect.txt
+@@ -131,9 +131,11 @@ Marzinski
+ misdetection
+ mpath
+ mpathb
++mpathconf
+ mpathpersist
+ mpathvalid
+ msecs
++multipathable
+ multipathc
+ multipathd
+ multipathed
+@@ -154,6 +156,7 @@ ontap
+ OOM
+ opensvc
+ OPTFLAGS
++outfile
+ paramp
+ partx
+ pathgroup
 diff --git a/libmultipath/config.c b/libmultipath/config.c
-index 002027a7..3d5943d3 100644
+index b8317f4d..0bbaa981 100644
 --- a/libmultipath/config.c
 +++ b/libmultipath/config.c
-@@ -961,6 +961,8 @@ int _init_config (const char *file, struct config *conf)
+@@ -939,6 +939,8 @@ int init_config__ (const char *file, struct config *conf)
  		validate_pctable(conf->overrides, 0, file);
  	} else {
  		condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
@@ -735,7 +760,7 @@ index 00000000..ce430075
 +fi
 diff --git a/multipath/mpathconf.8 b/multipath/mpathconf.8
 new file mode 100644
-index 00000000..ea025f31
+index 00000000..ec4e5c56
 --- /dev/null
 +++ b/multipath/mpathconf.8
 @@ -0,0 +1,151 @@
@@ -877,7 +902,7 @@ index 00000000..ea025f31
 +.B service multipathd stop
 +to stop the multipathd daemon on \fB--disable\fP, and
 +.B service multipathd reload
-+to reconfigure multipathd on \fB--user_frindly_names\fP and
++to reconfigure multipathd on \fB--user_friendly_names\fP and
 +\fB--find_multipaths\fP.
 +This option is set to \fBn\fP by default.
 +.SH FILES
diff --git a/0007-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/0007-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
index 9884258..cef8b56 100644
--- a/0007-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
+++ b/0007-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From d6ad888bad3850bb0a342ebcdc9fd78773eb3b2a Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Fri, 17 Oct 2014 11:20:34 -0500
 Subject: [PATCH] RH: add wwids from kernel cmdline mpath.wwids with -A
@@ -20,10 +20,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  3 files changed, 59 insertions(+), 3 deletions(-)
 
 diff --git a/multipath/main.c b/multipath/main.c
-index c21e3e0b..3f3ac9fb 100644
+index 31012874..a667c2ee 100644
 --- a/multipath/main.c
 +++ b/multipath/main.c
-@@ -120,7 +120,7 @@ usage (char * progname)
+@@ -111,7 +111,7 @@ usage (char * progname)
  	fprintf (stderr, "  %s [-v level] [-R retries] -F\n", progname);
  	fprintf (stderr, "  %s [-v level] [-l|-ll] [device]\n", progname);
  	fprintf (stderr, "  %s [-v level] [-a|-w] device\n", progname);
@@ -32,7 +32,7 @@ index c21e3e0b..3f3ac9fb 100644
  	fprintf (stderr, "  %s [-v level] [-i] [-c|-C] device\n", progname);
  	fprintf (stderr, "  %s [-v level] [-i] [-u|-U]\n", progname);
  	fprintf (stderr, "  %s [-h|-t|-T]\n", progname);
-@@ -134,6 +134,8 @@ usage (char * progname)
+@@ -125,6 +125,8 @@ usage (char * progname)
  		"  -f      flush a multipath device map\n"
  		"  -F      flush all multipath device maps\n"
  		"  -a      add a device wwid to the wwids file\n"
@@ -41,7 +41,7 @@ index c21e3e0b..3f3ac9fb 100644
  		"  -c      check if a device should be a path in a multipath device\n"
  		"  -C      check if a multipath device has usable paths\n"
  		"  -q      allow queue_if_no_path when multipathd is not running\n"
-@@ -448,6 +450,50 @@ static void cleanup_vecs(void)
+@@ -440,6 +442,50 @@ static void cleanup_vecs(void)
  	free_pathvec(vecs.pathvec, FREE_PATHS);
  }
  
@@ -92,7 +92,7 @@ index c21e3e0b..3f3ac9fb 100644
  static int
  configure (struct config *conf, enum mpath_cmds cmd,
  	   enum devtypes dev_type, char *devpath)
-@@ -861,7 +907,7 @@ main (int argc, char *argv[])
+@@ -851,7 +897,7 @@ main (int argc, char *argv[])
  		condlog(1, "failed to register cleanup handler for vecs: %m");
  	if (atexit(cleanup_bindings))
  		condlog(1, "failed to register cleanup handler for bindings: %m");
@@ -101,7 +101,7 @@ index c21e3e0b..3f3ac9fb 100644
  		switch(arg) {
  		case 'v':
  			if (!isdigit(optarg[0])) {
-@@ -932,6 +978,10 @@ main (int argc, char *argv[])
+@@ -922,6 +968,10 @@ main (int argc, char *argv[])
  		case 'T':
  			cmd = CMD_DUMP_CONFIG;
  			break;
@@ -138,14 +138,14 @@ index b88e9a4c..edd742aa 100644
  Remove the WWID for the specified device from the WWIDs file.
  .
 diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in
-index 01ceff7d..e0c2011b 100644
+index ab166435..1ec08c6e 100644
 --- a/multipathd/multipathd.service.in
 +++ b/multipathd/multipathd.service.in
-@@ -17,6 +17,7 @@ ConditionVirtualization=!container
+@@ -19,6 +19,7 @@ StartLimitBurst=3
  [Service]
  Type=notify
  NotifyAccess=main
-+ExecStartPre=-/sbin/multipath -A
- ExecStart=/sbin/multipathd -d -s
- ExecReload=/sbin/multipathd reconfigure
- TasksMax=infinity
++ExecStartPre=-@BINDIR@/multipath -A
+ ExecStart=@BINDIR@/multipathd -d -s
+ ExecReload=@BINDIR@/multipathd reconfigure
+ Restart=on-failure
diff --git a/0008-RH-reset-default-find_mutipaths-value-to-off.patch b/0008-RH-reset-default-find_mutipaths-value-to-off.patch
index 04ad52c..fdc90d4 100644
--- a/0008-RH-reset-default-find_mutipaths-value-to-off.patch
+++ b/0008-RH-reset-default-find_mutipaths-value-to-off.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 064d761121e7e2c7b63ab280e341d8010a413119 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Thu, 7 Jun 2018 17:43:52 -0500
 Subject: [PATCH] RH: reset default find_mutipaths value to off
@@ -14,10 +14,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
-index ed08c251..4b033ff9 100644
+index 134b690a..e2fe7ac4 100644
 --- a/libmultipath/defaults.h
 +++ b/libmultipath/defaults.h
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@
  #define DEFAULT_NO_PATH_RETRY	NO_PATH_RETRY_UNDEF
  #define DEFAULT_VERBOSITY	2
  #define DEFAULT_REASSIGN_MAPS	0
@@ -27,10 +27,10 @@ index ed08c251..4b033ff9 100644
  #define DEFAULT_DEV_LOSS_TMO	600
  #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON
 diff --git a/multipath/multipath.conf.5.in b/multipath/multipath.conf.5.in
-index 645e8f88..a7543939 100644
+index ba291e11..b8389db3 100644
 --- a/multipath/multipath.conf.5.in
 +++ b/multipath/multipath.conf.5.in
-@@ -1225,7 +1225,7 @@ as non-multipath and passed on to upper layers.
+@@ -1227,7 +1227,7 @@ as non-multipath and passed on to upper layers.
  \fBNote:\fR this may cause delays during device detection if
  there are single-path devices which aren\'t blacklisted.
  .TP
diff --git a/0009-RH-attempt-to-get-ANA-info-via-sysfs-first.patch b/0009-RH-attempt-to-get-ANA-info-via-sysfs-first.patch
index 1f94eb3..8065e9f 100644
--- a/0009-RH-attempt-to-get-ANA-info-via-sysfs-first.patch
+++ b/0009-RH-attempt-to-get-ANA-info-via-sysfs-first.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 335b8eb2773b07a602e84e14c1f3e289a9b25b5a Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Thu, 11 Apr 2019 13:25:42 -0500
 Subject: [PATCH] RH: attempt to get ANA info via sysfs first
@@ -13,10 +13,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  1 file changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/libmultipath/prioritizers/ana.c b/libmultipath/prioritizers/ana.c
-index e9827dca..80a32aa3 100644
+index 34527b22..4eaa3cc3 100644
 --- a/libmultipath/prioritizers/ana.c
 +++ b/libmultipath/prioritizers/ana.c
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
  #include "prio.h"
  #include "util.h"
  #include "structs.h"
@@ -24,7 +24,7 @@ index e9827dca..80a32aa3 100644
  
  enum {
  	ANA_ERR_GETCTRL_FAILED		= 1,
-@@ -36,6 +37,7 @@ enum {
+@@ -35,6 +36,7 @@ enum {
  	ANA_ERR_GETNS_FAILED,
  	ANA_ERR_NO_MEMORY,
  	ANA_ERR_NO_INFORMATION,
@@ -32,7 +32,7 @@ index e9827dca..80a32aa3 100644
  };
  
  static const char *ana_errmsg[] = {
-@@ -49,6 +51,7 @@ static const char *ana_errmsg[] = {
+@@ -48,6 +50,7 @@ static const char *ana_errmsg[] = {
  	[ANA_ERR_GETNS_FAILED]		= "couldn't get namespace info",
  	[ANA_ERR_NO_MEMORY]		= "out of memory",
  	[ANA_ERR_NO_INFORMATION]	= "invalid fd",
@@ -40,7 +40,7 @@ index e9827dca..80a32aa3 100644
  };
  
  static const char *anas_string[] = {
-@@ -107,6 +110,27 @@ static int get_ana_state(__u32 nsid, __u32 anagrpid, void *ana_log,
+@@ -106,6 +109,27 @@ static int get_ana_state(__u32 nsid, __u32 anagrpid, void *ana_log,
  	return -ANA_ERR_GETANAS_NOTFOUND;
  }
  
@@ -68,7 +68,7 @@ index e9827dca..80a32aa3 100644
  static int get_ana_info(struct path * pp)
  {
  	int	rc;
-@@ -209,8 +233,11 @@ int getprio(struct path *pp, __attribute__((unused)) char *args)
+@@ -208,8 +232,11 @@ int getprio(struct path *pp, __attribute__((unused)) char *args)
  
  	if (pp->fd < 0)
  		rc = -ANA_ERR_NO_INFORMATION;
diff --git a/0010-RH-make-parse_vpd_pg83-match-scsi_id-output.patch b/0010-RH-make-parse_vpd_pg83-match-scsi_id-output.patch
index c090da0..f7bca92 100644
--- a/0010-RH-make-parse_vpd_pg83-match-scsi_id-output.patch
+++ b/0010-RH-make-parse_vpd_pg83-match-scsi_id-output.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 137c96d16b6bb03d8a52854e152db4ee36b7d9e4 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Thu, 25 Mar 2021 13:05:10 -0500
 Subject: [PATCH] RH: make parse_vpd_pg83 match scsi_id output
@@ -14,10 +14,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  2 files changed, 8 insertions(+), 10 deletions(-)
 
 diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
-index e2052422..3bcd94ce 100644
+index 31db8758..21cfcc73 100644
 --- a/libmultipath/discovery.c
 +++ b/libmultipath/discovery.c
-@@ -1221,13 +1221,9 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
+@@ -1225,13 +1225,9 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
  				good_len = 8;
  				break;
  			case 2:
@@ -33,7 +33,7 @@ index e2052422..3bcd94ce 100644
  				good_len = 8;
  				break;
  			default:
-@@ -1245,10 +1241,6 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
+@@ -1249,10 +1245,6 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
  			break;
  		case 0x8:
  			/* SCSI Name: Prio 3 */
diff --git a/0011-RH-add-scsi-device-handlers-to-modules-load.d.patch b/0011-RH-add-scsi-device-handlers-to-modules-load.d.patch
index 7624c5b..3fe7c25 100644
--- a/0011-RH-add-scsi-device-handlers-to-modules-load.d.patch
+++ b/0011-RH-add-scsi-device-handlers-to-modules-load.d.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 374755791536be4870ab2e93ae36549cbaaeb800 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Fri, 25 Mar 2022 18:12:06 -0500
 Subject: [PATCH] RH: add scsi device handlers to modules-load.d
@@ -11,7 +11,7 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.inc b/Makefile.inc
-index 94e0ec85..49514b06 100644
+index 03aee175..936a622f 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
 @@ -16,7 +16,7 @@ READLINE :=
diff --git a/0012-RH-compile-with-libreadline-support.patch b/0012-RH-compile-with-libreadline-support.patch
index eb0ab13..0964c42 100644
--- a/0012-RH-compile-with-libreadline-support.patch
+++ b/0012-RH-compile-with-libreadline-support.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From cc15379130e8aa068e97c64afd46be212b456d4f Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Tue, 15 Nov 2022 18:03:33 -0600
 Subject: [PATCH] RH: compile with libreadline support
@@ -12,7 +12,7 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.inc b/Makefile.inc
-index 49514b06..a3ed9f28 100644
+index 936a622f..f475f70f 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
 @@ -12,7 +12,7 @@
diff --git a/0013-RH-Add-mpathcleanup.patch b/0013-RH-Add-mpathcleanup.patch
index bd2dcd6..d1a8e84 100644
--- a/0013-RH-Add-mpathcleanup.patch
+++ b/0013-RH-Add-mpathcleanup.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 2ef5bd86052ba0b22f4d3a16e69cdf268d90a53a Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Fri, 7 Jul 2023 15:25:59 -0500
 Subject: [PATCH] RH: Add mpathcleanup
diff --git a/0014-multipathd-fix-flush-check-in-flush_map.patch b/0014-multipathd-fix-flush-check-in-flush_map.patch
deleted file mode 100644
index 3ff957d..0000000
--- a/0014-multipathd-fix-flush-check-in-flush_map.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Wed, 5 Jun 2024 19:22:48 -0400
-Subject: [PATCH] multipathd: fix flush check in flush_map()
-
-Forgot the comparison in the "if" statement.
-
-Fixes 8a3898339 ("multipathd: sync features on flush_map failure corner case")
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
-Reviewed-by: Martin Wilck <mwilck@suse.com>
----
- multipathd/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/multipathd/main.c b/multipathd/main.c
-index 09286dd0..58afe14a 100644
---- a/multipathd/main.c
-+++ b/multipathd/main.c
-@@ -813,7 +813,7 @@ flush_map(struct multipath * mpp, struct vectors * vecs)
- {
- 	int r = dm_suspend_and_flush_map(mpp->alias, 0);
- 	if (r != DM_FLUSH_OK) {
--		if (DM_FLUSH_FAIL_CANT_RESTORE)
-+		if (r == DM_FLUSH_FAIL_CANT_RESTORE)
- 			remove_feature(&mpp->features, "queue_if_no_path");
- 		condlog(0, "%s: can't flush", mpp->alias);
- 		return r;
diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index 9e74d46..5d80d4e 100644
--- a/device-mapper-multipath.spec
+++ b/device-mapper-multipath.spec
@@ -1,15 +1,15 @@
 Name:    device-mapper-multipath
-Version: 0.9.9
-Release: 6%{?dist}
+Version: 0.13.0
+Release: 2%{?dist}
 Summary: Tools to manage multipath devices using device-mapper
-# Automatically converted from old format: GPLv2 - review is highly recommended.
-License: GPL-2.0-only
+# readline uses GPL-3.0-only
+License: GPL-2.0-only AND GPL-3.0-only
 URL:     http://christophe.varoqui.free.fr/
 
 # The source for this package was pulled from upstream's git repo.  Use the
 # following command to generate the tarball
-# curl -L https://github.com/opensvc/multipath-tools/archive/0.9.9.tar.gz -o multipath-tools-0.9.9.tgz
-Source0: multipath-tools-0.9.9.tgz
+# curl -L https://github.com/opensvc/multipath-tools/archive/0.13.0.tar.gz -o multipath-tools-0.13.0.tgz
+Source0: multipath-tools-0.13.0.tgz
 Source1: multipath.conf
 Patch0001: 0001-RH-fixup-udev-rules-for-redhat.patch
 Patch0002: 0002-RH-Remove-the-property-blacklist-exception-builtin.patch
@@ -24,7 +24,6 @@ Patch0010: 0010-RH-make-parse_vpd_pg83-match-scsi_id-output.patch
 Patch0011: 0011-RH-add-scsi-device-handlers-to-modules-load.d.patch
 Patch0012: 0012-RH-compile-with-libreadline-support.patch
 Patch0013: 0013-RH-Add-mpathcleanup.patch
-Patch0014: 0014-multipathd-fix-flush-check-in-flush_map.patch
 
 # runtime
 Requires: %{name}-libs = %{version}-%{release}
@@ -66,8 +65,8 @@ The tools are :
 
 %package libs
 Summary: The %{name} modules and shared library
-# only libmpathcmd is LGPLv2+
-License: GPLv2 and LGPLv2+
+# only libmpathcmd is LGPL-2.1-or-later AND LGPL-2.0-or-later
+License: GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later
 
 %description libs
 The %{name}-libs provides the path checker
@@ -112,7 +111,7 @@ This package contains the files needed to develop applications that use
 device-mapper-multipath's libdmmp C API library
 
 %prep
-%autosetup -n multipath-tools-0.9.9 -p1
+%autosetup -n multipath-tools-0.13.0 -p1
 cp %{SOURCE1} .
 
 %build
@@ -164,6 +163,7 @@ fi
 %{_sbindir}/mpathcleanup
 %{_sbindir}/mpathpersist
 %{_unitdir}/multipathd.service
+%{_unitdir}/multipathd-queueing.service
 %{_unitdir}/multipathd.socket
 %{_mandir}/man5/multipath.conf.5*
 %{_mandir}/man8/multipath.8*
@@ -234,6 +234,46 @@ fi
 %{_pkgconfdir}/libdmmp.pc
 
 %changelog
+* Thu Nov 13 2025 Benjamin Marzinski <bmarzins@redhat.com> - 0.13.0-2
+- Move STI tests to TMT
+
+* Tue Nov  4 2025 Benjamin Marzinski <bmarzins@redhat.com> - 0.13.0-1
+- Update source to upstream release 0.13.0
+  * Previous patches 0001-0004 are included in the tarball
+- Install /lib/systemd/system/multipathd-queueing.service
+- Rename redhat patches
+  * Previous patches 0005-0017 are now patches 0001-0013
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Feb 27 2025 Benjamin Marzinski <bmarzins@redhat.com> - 0.11.1-1
+- Update source to upstream staging branch for 0.11.1 plus additional
+  stable branch patches.
+  * Previous patches 0001-0032 are included in the tarball
+- Rename redhat patches
+  * Previous patches 0033-0045 are now patches 0005-0017
+
+* Sat Feb  1 2025 Benjamin Marzinski <bmarzins@redhat.com> - 0.10.0-5
+- Update source to upstream staging branch for 0.10.y (will be 0.10.2 when
+  merged).
+- Rebase redhat patches
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.10.0-3
+- Rebuilt for the bin-sbin merge (2nd attempt)
+
+* Thu Aug 29 2024 Benjamin Marzinski <bmarzins@redhat.com> - 0.10.0-2
+- update CI tests.
+
+* Thu Aug 29 2024 Benjamin Marzinski <bmarzins@redhat.com> - 0.10.0-1
+- Update source to upstream version 0.9.9
+  * Previous patch 0014-multipathd-fix-flush-check-in-flush_map.patch is
+    included in the source tarball
+- Rebase redhat patches
+
 * Fri Aug  9 2024 Benjamin Marzinski <bmarzins@redhat.com> - 0.9.9-6
 - Add 0014-multipathd-fix-null-pointer-dereference-in-uev_updat.patch
   * multipath features tracking on failed removes
diff --git a/plans/multipath.fmf b/plans/multipath.fmf
new file mode 100644
index 0000000..876c77a
--- /dev/null
+++ b/plans/multipath.fmf
@@ -0,0 +1,58 @@
+summary: basic functionality tests
+
+provision:
+    hardware:
+        memory: ">= 2 GB"
+
+prepare:
+    how: install
+    package:
+      - device-mapper-multipath
+      - perl
+
+discover:
+    how: shell
+    tests:
+     -  name: medium_error_scsi_debug
+        path: /tests/medium_error_scsi_debug
+        test: ./main.sh
+        duration: 15m
+     -  name: squelch_scsi_id
+        path: /tests/squelch_scsi_id
+        test: ./main.sh
+        duration: 15m
+     -  name: multipathd_oom
+        path: /tests/multipathd_oom
+        test: ./main.sh
+        duration: 15m
+     -  name: user_friendly_names
+        path: /tests/user_friendly_names
+        test: ./main.sh
+        duration: 15m
+     -  name: kpartx_4k_aligned
+        path: /tests/kpartx_4k_aligned
+        test: ./main.sh
+        duration: 15m
+     -  name: bindings
+        path: /tests/bindings
+        test: ./main.sh
+        duration: 15m
+     -  name: restate_module
+        path: /tests/restate_module
+        test: ./main.sh
+        duration: 15m
+     -  name: find_multipaths
+        path: /tests/find_multipaths
+        test: ./main.sh
+        duration: 15m
+     -  name: multipath_conf_syntax
+        path: /tests/multipath_conf_syntax
+        test: ./main.sh
+        duration: 15m
+     -  name: alias_clash
+        path: /tests/alias_clash
+        test: ./main.sh
+        duration: 15m
+
+execute:
+    how: tmt
diff --git a/sources b/sources
index f098bc9..233c4ea 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (multipath-tools-0.9.9.tgz) = 65b5d5c48792f6041d700968c87675bc349ede475fe178a203814dbb0325f69895782a22c5c35f6c0157f694951714de9e83cc1464a6c062d911a58faed8960a
+SHA512 (multipath-tools-0.13.0.tgz) = 75c84524ee27590b8b751ea500898a44e5ac3d58d55be6bcab919d0d423049db3a4466fcb9135705cf63ba074416973bb651255063269e9f682f11d21ba57e59
 SHA512 (multipath.conf) = 71953dce5a68adcf60a942305f5a66023e6f4c4baf53b1bfdb4edf65ed5b8e03db804363c36d1dcfd85591f4766f52b515269904c53b84d7b076da0b80b09942
diff --git a/tests/bindings/main.sh b/tests/bindings/main.sh
index 2d6f284..76292e4 100755
--- a/tests/bindings/main.sh
+++ b/tests/bindings/main.sh
@@ -18,40 +18,110 @@
 # Author: Lin Li   <lilin@redhat.com>
 
 #set -x
-source ../include/ec.sh || exit 200
-
+source ../include/tc.sh || exit 200
 tlog "running $0"
 
-trun "service multipathd stop"
-rpm -q device-mapper-multipath || yum install -y device-mapper-multipath
-trun "mpathconf --enable --with_multipathd y --user_friendly_names y"
-trun "service multipathd status"
-sleep 5
+cleanup ()
+{
+    local retries
+    if pidof multipathd; then
+        tlog "stopping multipathd"
+        trun "systemctl stop multipathd.service || pkill multipathd"
+        sleep 1
+    fi
+    retries=10
+    while pidof multipathd; do
+        ((retries--))
+        if [[ $retries -le 0 ]]; then
+            tfail_ "failed to stop multipath"
+            tend
+        fi
+        tlog "waiting for multipathd to stop"
+        sleep 2
+        pidof multipathd && pkill multipathd
+    done
+    trun "multipath -l -v1"
+    retries=10
+    while [[ -n `multipath -l -v1` ]]; do
+        ((retries--))
+        if [[ $retries -le 0 ]]; then
+            tfail_ "failed to remove deviece"
+            tend
+        fi
+        tlog "removing multipath device"
+        trun "udevadm settle"
+        trun "multipath -DF"
+        sleep 2
+    done
+    if lsmod | grep -q "^scsi_debug"; then
+        tlog "removing scsi_debug module"
+        tok "rmmod scsi_debug"
+    fi
+    trun "rm -f /etc/multipath.conf"
+}
 
-trun "multipath -F"
-sleep 5
-terr "modprobe -r scsi_debug"
-terr "modprobe scsi_debug num_tgts=1 vpd_use_hostno=0 add_host=2 delay=20 \
-max_luns=2 no_lun_0=1"
-sleep 60 
+assert ()
+{
+    local cmd="$*"
+    _trun_ "$cmd" 0
+    if test $? -eq 0; then
+        tpass_ "$cmd" ;
+    else
+        tfail_ "$cmd" ;
+        cleanup ;
+        tend ;
+    fi
+}
 
-disk_path=$(get_scsi_debug_devices)
-disk=$(basename $disk_path)
-mpath_name=$(get_mpath_disk_by_scsi_device $disk)
+setup_config ()
+{
+    trun "mpathconf --enable --user_friendly_names y"
+    sed -i '/^blacklist[[:space:]]*{/ a\
+	device {\
+		vendor ".*"\
+		product ".*"\
+	}
+' /etc/multipath.conf
+    cat << _EOF_ >> /etc/multipath.conf
+
+blacklist_exceptions {
+        device {
+                vendor Linux
+                product scsi_debug
+        }
+}
+_EOF_
+    trun "cat /etc/multipath.conf"
+}
+
+do_reconfigure ()
+{
+    tok "multipathd reconfigure"
+    sleep 5
+}
+
+rpm -q device-mapper-multipath || dnf install -y device-mapper-multipath
+cleanup
+setup_config
+trun "rm -r /etc/multipath/bindings"
+trun "modprobe scsi_debug vpd_use_hostno=0 add_host=2"
+sleep 5
+trun "systemctl start multipathd.service"
+while multipathd show daemon | grep -qv idle; do
+    tlog "waiting for multipathd to start"
+    sleep 1
+done
+
+trun 'multipathd show maps raw format "%n"'
+mpath_name=`multipathd show maps raw format "%n" | head -1`
+assert "[[ -n $mpath_name ]] && [[ $mpath_name != ok ]]"
 new_alias="mpath_test_$$"
 
 trun "sed -i 's/$mpath_name/$new_alias/' /etc/multipath/bindings"
-trun "multipath -r"
-sleep 5
-tok "[[ -b /dev/mapper/$new_alias ]]"
-tok is_mpath $new_alias
-sleep 5
+do_reconfigure
+trun 'multipathd show maps raw format "%n"'
+mpath_name=`multipathd show maps raw format "%n" | head -1`
+assert "[[ $mpath_name = $new_alias ]]"
 
-trun "multipath -F"
-sleep 5
-trun "modprobe -r scsi_debug"
-trun "service multipathd stop"
-sleep 3
-trun "multipath -W"
-trun "rm /etc/multipath/bindings"
+cleanup
 tend
diff --git a/tests/find_multipaths/Makefile b/tests/find_multipaths/Makefile
deleted file mode 100644
index b78dc57..0000000
--- a/tests/find_multipaths/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2016 Red Hat, Inc.
-# #
-# # This program is free software: you can redistribute it and/or modify
-# # it under the terms of the GNU General Public License as published by
-# # the Free Software Foundation, either version 3 of the License, or
-# # (at your option) any later version.
-# #
-# # This program is distributed in the hope that it will be useful,
-# # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# # GNU General Public License for more details.
-# #
-# # You should have received a copy of the GNU General Public License
-# # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# # Author: Lin Li   <lilin@redhat.com>
-
-.PHONY: all install download clean
-
-BUILT_FILES=
-
-FILES=$(METADATA)  Makefile PURPOSE main.sh  
-
-run: $(FILES) build
-	./main.sh
-
-build: $(BUILT_FILES)
-	chmod a+x ./main.sh
-
-clean:
-	rm -f *~ *.rpm $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@touch $(METADATA)
-	@echo "Owner:        LiLin <lilin@redhat.com>" > $(METADATA)
-	@echo "Name:         $(TEST)" >> $(METADATA)
-	@echo "Path:         $(TEST_DIR)"	>> $(METADATA)
-	@echo "License:      GPLv3" >> $(METADATA)
-	@echo "TestVersion:  $(TESTVERSION)"	>> $(METADATA)
-	@echo "Description:  find_multipaths" >> $(METADATA)
-	@echo "TestTime:     15m" >> $(METADATA)
-	@echo "RunFor:       device-mapper-multipath" >> $(METADATA)
-	@echo "Requires:     device-mapper-multipath" >> $(METADATA)
-
-	rhts-lint $(METADATA)
diff --git a/tests/find_multipaths/main.sh b/tests/find_multipaths/main.sh
index 4d94c87..28c325c 100755
--- a/tests/find_multipaths/main.sh
+++ b/tests/find_multipaths/main.sh
@@ -18,39 +18,92 @@
 # Author: Lin Li   <lilin@redhat.com>
 
 #set -x
-source ../include/ec.sh || exit 200
+source ../include/tc.sh || exit 200
+tlog "running $0"
+
+remove_devices ()
+{
+    local retries
+    retries=10
+    while [[ -n `multipath -l -v1` ]]; do
+        ((retries--))
+        if [[ $retries -le 0 ]]; then
+            tfail_ "failed to remove devices"
+	    cleanup
+            tend
+        fi
+        tlog "removing multipath devices"
+        trun "udevadm settle"
+        trun "multipath -F"
+        sleep 2
+    done
+}
 
 cleanup ()
 {
-	trun "multipathd disablequeueing maps"
-	trun "service multipathd stop"
-	sleep 5
-	trun "udevadm settle"
-	trun "multipath -F"
-	sleep 5
-	trun "modprobe -r scsi_debug"
+    local retries
+    if pidof multipathd; then
+        tlog "stopping multipathd"
+        trun "systemctl stop multipathd.service || pkill multipathd"
+        sleep 1
+    fi
+    retries=10
+    while pidof multipathd; do
+	((retries--))
+        if [[ $retries -le 0 ]]; then
+            tfail_ "failed to stop multipath"
+            tend
+        fi
+        tlog "waiting for multipathd to stop"
+        sleep 2
+        pidof multipathd && pkill multipathd
+    done
+    trun "multipath -l -v1"
+    retries=10
+    while [[ -n `multipath -l -v1` ]]; do
+        ((retries--))
+        if [[ $retries -le 0 ]]; then
+            tfail_ "failed to remove devices"
+            tend
+        fi
+        tlog "removing multipath devices"
+        trun "udevadm settle"
+        trun "multipath -DF"
+        sleep 2
+    done
+    if lsmod | grep -q "^scsi_debug"; then
+        tlog "removing scsi_debug module"
+        tok "rmmod scsi_debug"
+    fi
+    trun "rm -f /etc/multipath.conf"
+    trun "rm -f /etc/multipath/wwids"
+    trun "rm -r /etc/multipath/bindings"
 }
 
-tlog "running $0"
+assert ()
+{
+    local cmd="$*"
+    _trun_ "$cmd" 0
+    if test $? -eq 0; then
+        tpass_ "$cmd" ;
+    else
+        tfail_ "$cmd" ;
+        cleanup ;
+        tend ;
+    fi
+}
 
-# which not set find_multipaths yes, so multipath always create a multipath device for single device
-# so stop service and reconfig with  --find_multipaths y, and reload/start the service again. 
-rpm -q device-mapper-multipath || yum install -y device-mapper-multipath
+setup_config ()
+{
+    trun "mpathconf --enable --user_friendly_names y --find_multipaths y"
+    sed -i '/^blacklist[[:space:]]*{/ a\
+	device {\
+		vendor ".*"\
+		product ".*"\
+	}
+' /etc/multipath.conf
+    cat << _EOF_ >> /etc/multipath.conf
 
-# test with find_multipath=y, will not multipath for the single device; reload/start the service to enable the config
-cleanup
-trun "rm -f /etc/multipath.conf"
-trun "rm -f /etc/multipath/wwids"
-trun "mpathconf --enable --user_friendly_names y --find_multipaths y --with_multipathd n"
-sed -i '/^blacklist[[:space:]]*{/ a\
-	device {\n              vendor ".*"\n           product ".*"\n  }
-' /etc/multipath.conf
-if grep -qw blacklist_exceptions /etc/multipath.conf ; then
-	sed -i '/^blacklist_exceptions[[:space:]]*{/ a\
-	device {\n              vendor Linux\n          product scsi_debug\n    }
-' /etc/multipath.conf
-else
-	cat << _EOF_ >> /etc/multipath.conf
 blacklist_exceptions {
 	device {
 		vendor Linux
@@ -58,56 +111,69 @@ blacklist_exceptions {
 	}
 }
 _EOF_
-fi
-trun "service multipathd start"
+    trun "cat /etc/multipath.conf"
+}
+
+do_reconfigure ()
+{
+    trun "cat /etc/multipath.conf"
+    tok "multipathd reconfigure"
+    sleep 5
+}
+
+trun "rpm -q device-mapper-multipath || dnf install -y device-mapper-multipath"
+cleanup
+setup_config
+
+# test with find_multipath=y, will not multipath the single device
 trun "modprobe scsi_debug"
 sleep 5
+trun "systemctl start multipathd.service"
+while multipathd show daemon | grep -qv idle; do
+    tlog "waiting for multipathd to start"
+    sleep 1
+done
+trun 'multipathd show paths raw format "%d %m"'
+trun 'cat /etc/multipath/wwids'
+mpath_name=`multipathd show paths raw format "%m" | head -1`
+tok "[[ $mpath_name = '[orphan]' ]]"
+remove_devices
+
+# test with find_multipath=n, will multipath the single device
+trun 'mpathconf --find_multipaths n'
+do_reconfigure
+trun 'multipathd show paths raw format "%d %m"'
+trun 'cat /etc/multipath/wwids'
+mpath_name=`multipathd show paths raw format "%m" | head -1`
+tok "[[ -n $mpath_name ]] && [[ $mpath_name != '[orphan]' ]]"
+remove_devices
+
+# test with find_multipath=y, with multipath single device with known WWID
+trun 'mpathconf --find_multipaths y'
+do_reconfigure
+trun 'multipathd show paths raw format "%d %m"'
+trun 'cat /etc/multipath/wwids'
+mpath_name=`multipathd show paths raw format "%m" | head -1`
+tok "[[ -n $mpath_name ]] && [[ $mpath_name != '[orphan]' ]]"
+remove_devices
+
+# Clear WWID, test with find_multipath=y, will not multipath single device
 trun "multipath -W"
-cat /etc/multipath/wwids
-trun "multipath"
-disk_path=$(get_scsi_debug_devices)
-disk_node=$(basename $disk_path)
-mpath_name=$(get_mpath_disk_by_scsi_device $disk_node)
-tok '[[ $mpath_name = "[orphan]" ]]'
-
-# test with find_multipath=n, will multipath for the single device
-trun "mpathconf --user_friendly_names y --find_multipaths n --with_multipathd y"
-sleep 5
-mpath_name=$(get_mpath_disk_by_scsi_device $disk_node)
-tok "is_mpath $mpath_name"
-
-# flush new created path
-trun "multipath -F"
-sleep 1
-
-# test with find_multipath=y, A path has the same WWID as a multipath device that was previously created
-trun "mpathconf --user_friendly_names y --find_multipaths y --with_multipathd y"
-sleep 5
-mpath_name=$(get_mpath_disk_by_scsi_device $disk_node)
-tok "is_mpath $mpath_name"
-trun "multipath -F"
-sleep 1
-
-# Clear wwid, test with find_multipath=y, will not multipath for the single device
-trun "multipath -W"
-trun "service multipathd reload"
-sleep 5
-mpath_name=$(get_mpath_disk_by_scsi_device $disk_node)
-tok '[[ $mpath_name = "[orphan]" ]]'
-
-trun "multipath -F"
-sleep 5
-trun "modprobe -r scsi_debug"
+do_reconfigure
+trun 'multipathd show paths raw format "%d %m"'
+trun 'cat /etc/multipath/wwids'
+mpath_name=`multipathd show paths raw format "%m" | head -1`
+tok "[[ $mpath_name = '[orphan]' ]]"
+remove_devices
+assert 'rmmod scsi_debug'
 
 # test find_multipaths=y create device for paths have same wwid
-tok "modprobe scsi_debug num_tgts=1 vpd_use_hostno=0 add_host=2 delay=20 max_luns=2 no_lun_0=1"
-sleep 10
-disk_paths=$(get_scsi_debug_devices)
-disk_node=$(basename $disk_paths)
-mpath_name=$(get_mpath_disk_by_scsi_device $disk_node)
-tok "is_mpath $mpath_name"
+trun "modprobe scsi_debug vpd_use_hostno=0 add_host=2"
+sleep 5
+trun 'multipathd show paths raw format "%d %m"'
+trun 'cat /etc/multipath/wwids'
+mpath_name=`multipathd show paths raw format "%m" | head -1`
+tok "[[ -n $mpath_name ]] && [[ $mpath_name != '[orphan]' ]]"
 
 cleanup
-trun "multipath -W"
-cat /etc/multipath/wwids
 tend
diff --git a/tests/include/ec.sh b/tests/include/ec.sh
index 22dfc40..4b0aba9 100755
--- a/tests/include/ec.sh
+++ b/tests/include/ec.sh
@@ -44,9 +44,12 @@ function _init (){
 }
 
 function _destroy (){
-    sleep 10
-    Cmd "multipath -F"
+    Cmd "multipathd disablequeueing maps"
     sleep 5
+    Cmd "multipath -DF -R2"
+    Cmd "service multipathd stop"
+    sleep 5
+    Cmd "udevadm settle"
     Cmd "modprobe -r scsi_debug"
 }
 
@@ -174,10 +177,7 @@ AA
     fi
 #setup scsi_debug
     echo "INFO: Loading scsi_debug module for simulation of mpath"
-    modprobe scsi_debug \
-        num_tgts=1 vpd_use_hostno=0 \
-        add_host=4 delay=20 \
-        max_luns=2 no_lun_0=1 2>&1 1>/dev/null
+    modprobe scsi_debug vpd_use_hostno=0 add_host=2
 
     echo "INFO: Waiting for udev to create /dev/sdX"
     sleep 15s #wait for udev to create /dev/sdX
@@ -189,8 +189,6 @@ AA
 #enable multipath for scsi_debug.
     cat << AA > /etc/multipath.conf
 defaults {
-#Enable multibus is for mutlbus testing
-    path_grouping_policy multibus
     user_friendly_names     yes
 }
 blacklist {
diff --git a/tests/medium_error_scsi_debug/main.sh b/tests/medium_error_scsi_debug/main.sh
index db2f008..35c6e6f 100755
--- a/tests/medium_error_scsi_debug/main.sh
+++ b/tests/medium_error_scsi_debug/main.sh
@@ -16,47 +16,51 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Author: LiLin <lilin@redhat.com>
+source ../include/tc.sh || exit 200
 
-function cleanup()
+cleanup()
 {
     sleep 5
     udevadm settle
-    multipath -F
+    trun "multipath -DF"
     sleep 5
-    modprobe -r scsi_debug    
-
-    return 0
+    trun "modprobe -r scsi_debug"
 }
 
-yum -y install device-mapper device-mapper-multipath
-mpathconf --enable
-service multipathd stop
-modprobe scsi_debug num_tgts=1 vpd_use_hostno=0 add_host=2 delay=20  max_luns=2 no_lun_0=1 opts=2
+assert ()
+{
+	local cmd="$*"
+	_trun_ "$cmd" 0
+	if test $? -eq 0; then
+		tpass_ "$cmd" ;
+	else
+		tfail_ "$cmd" ;
+		cleanup ;
+		tend ;
+	fi
+}
+
+tlog "running $0"
+rpm -q device-mapper-multipath || dnf install -y device-mapper-multipath
+trun "multipathd disablequeueing maps"
+cleanup
+trun "service multipathd stop"
+trun "rm -f /etc/multipath.conf"
+trun "mpathconf --enable"
+trun "modprobe scsi_debug vpd_use_hostno=0 add_host=2 opts=2"
 sleep 5
-multipath > /dev/null
+trun "multipath"
 sleep 5
+trun "multipath -l"
 mpathdev=`multipath -l | grep scsi_debug | awk '{print $1}' | head -1`
-if [ -z "$mpathdev" ]; then
-	echo "------- FAIL, no multipath device created -----"
-	cleanup
-	exit 1
-fi
+assert "[[ -n \"$mpathdev\" ]]"
 before_active=`multipath -l $mpathdev | grep "active undef" | wc -l`
+tlog "before active = ${before_active}"
 
 IO_error=`dd if=/dev/zero of=/dev/mapper/$mpathdev bs=1024 seek=2330 count=10 2>&1 | grep -o "Input/output error" `
-if [ -n "$IO_error" ];then
-	after_active=`multipath -l $mpathdev | grep "active undef" | wc -l`
-	if [ "$before_active" -eq "$after_active" ]; then
-		echo "------- PASS,  a medium error, correctly generated an I/O error and did not fail paths -----"
-		cleanup
-		exit 0
-	else
-		echo "------- FAIL, paths failed -----"
-		cleanup
-		exit 1
-	fi
-else
-	echo "------- FAIL, did not generate an I/O error -----"
-	cleanup
-	exit 1
-fi
+assert "[[ -n \"$IO_error\" ]]"
+after_active=`multipath -l $mpathdev | grep "active undef" | wc -l`
+tlog "after active = ${after_active}"
+assert "[[ \"$before_active\" -eq \"$after_active\" ]]"
+cleanup
+tend
diff --git a/tests/provision.fmf b/tests/provision.fmf
deleted file mode 100644
index 62a6eba..0000000
--- a/tests/provision.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-standard-inventory-qcow2:
-  qemu:
-    m: 2G
diff --git a/tests/restate_module/main.sh b/tests/restate_module/main.sh
index 565e59c..be60eba 100755
--- a/tests/restate_module/main.sh
+++ b/tests/restate_module/main.sh
@@ -48,10 +48,8 @@ rpm -q device-mapper-multipath || yum install -y device-mapper-multipath
 tlog "device-mapper-multipath is installed"
 # cleanup existing devices
 trun "rm /etc/multipath.conf"
-trun "mpathconf --enable --with_module y"
-sed -i '/^defaults[[:space:]]*{/ a\
-	max_polling_interval 10
-' /etc/multipath.conf
+trun "mpathconf --enable --with_module y --option max_polling_interval:10"
+trun "mpathconf --option detect_pgpolicy_use_tpg:yes"
 trun "service multipathd stop"
 trun "multipath -F"
 sleep 5
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 15f26d2..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-# No tests suitable for atomic environment
-# No tests suitable for container environment
-
-# Tests suitable for classic environment
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    tests:
-     - medium_error_scsi_debug:
-        run: ./main.sh
-        timeout: 15m
-     - squelch_scsi_id:
-        run: ./main.sh
-        timeout: 15m
-     - multipathd_oom:
-        run: ./main.sh
-        timeout: 15m
-     - user_friendly_names:
-        run: ./main.sh
-        timeout: 15m
-     - kpartx_4k_aligned:
-        run: ./main.sh
-        timeout: 15m
-     - bindings:
-        run: ./main.sh
-        timeout: 15m
-     - restate_module:
-        run: ./main.sh
-        timeout: 15m
-     - find_multipaths:
-        run: ./main.sh
-        timeout: 15m
-     - multipath_conf_syntax:
-        run: ./main.sh
-        timeout: 15m
-     - alias_clash:
-        run: ./main.sh
-        timeout: 15m
-    required_packages:
-     - device-mapper-multipath
-     - perl
diff --git a/tests/user_friendly_names/main.sh b/tests/user_friendly_names/main.sh
index 56082fd..1d48801 100755
--- a/tests/user_friendly_names/main.sh
+++ b/tests/user_friendly_names/main.sh
@@ -17,50 +17,125 @@
 
 # Author: Lin Li   <lilin@redhat.com>
 
-source ../include/ec.sh || exit 200
-
+source ../include/tc.sh || exit 200
 tlog "running $0"
 
-trun "rpm -q device-mapper-multipath || yum install -y device-mapper-multipath"
-trun "mpathconf --enable --with_multipathd y --user_friendly_names y"
+cleanup ()
+{
+    local retries
+    if pidof multipathd; then
+        tlog "stopping multipathd"
+        trun "systemctl stop multipathd.service || pkill multipathd"
+        sleep 1
+    fi
+    retries=10
+    while pidof multipathd; do
+	((retries--))
+        if [[ $retries -le 0 ]]; then
+            tfail_ "failed to stop multipath"
+            tend
+        fi
+        tlog "waiting for multipathd to stop"
+        sleep 2
+        pidof multipathd && pkill multipathd
+    done
+    trun "multipath -l -v1"
+    retries=10
+    while [[ -n `multipath -l -v1` ]]; do
+        ((retries--))
+        if [[ $retries -le 0 ]]; then
+            tfail_ "failed to remove deviece"
+            tend
+        fi
+        tlog "removing multipath device"
+        trun "udevadm settle"
+        trun "multipath -DF"
+        sleep 2
+    done
+    if lsmod | grep -q "^scsi_debug"; then
+        tlog "removing scsi_debug module"
+        tok "rmmod scsi_debug"
+    fi
+    trun "rm -f /etc/multipath.conf"
+}
 
-# backup the /etc/multipath.conf
-trun "cp /etc/multipath.conf /etc/multipath.conf.$$"
-trun "multipath -F"
+assert ()
+{
+    local cmd="$*"
+    _trun_ "$cmd" 0
+    if test $? -eq 0; then
+        tpass_ "$cmd" ;
+    else
+        tfail_ "$cmd" ;
+        cleanup ;
+        tend ;
+    fi
+}
 
-trun "modprobe scsi_debug num_tgts=1 vpd_use_hostno=0 add_host=2 delay=20 \
-max_luns=2 no_lun_0=1"
-trun "multipath"
-# wwid shown slowly on s390x by the script framework, but normally when run by multipath command directly
-# so extend sleep time 
-sleep 20
+setup_config ()
+{
+    trun "mpathconf --enable --user_friendly_names y"
+    sed -i '/^blacklist[[:space:]]*{/ a\
+	device {\
+		vendor ".*"\
+		product ".*"\
+	}
+' /etc/multipath.conf
+    cat << _EOF_ >> /etc/multipath.conf
 
-disk=$(get_scsi_debug_devices)
-disk=$(basename $disk)
-wwid=$(get_wwid_of_disk $disk)
-mpath=$(get_mpath_disk_by_scsi_device $disk)
+blacklist_exceptions {
+	device {
+		vendor Linux
+		product scsi_debug
+	}
+}
 
-# user_friendly_names = yes and mpath=test
-#cur_dir=/mnt/tests/kernel/storage/multipath/user_friendly_names/
-#cur_dir=/home/test/scratch/device-mapper-multipath/user_friendly_names
-trun "cat multipath.conf.yes | sed "s/your_wwid/$wwid/g" > /etc/multipath.conf"
-trun "cat -n /etc/multipath.conf"
-trun "multipath -r"
-echo ">>> Verify 'test ($wwid)' is present ..."
-trun "multipath -ll"
-tok "multipath -ll | egrep \"^test\""
+multipaths {
+	multipath {
+		wwid TEST_WWID
+		alias test
+	}
+}
+_EOF_
+    trun "cat /etc/multipath.conf"
+}
 
-# user_friendly_names = no
-trun "cat multipath.conf.no > /etc/multipath.conf"
-trun "multipath -r"
-echo ">>> Verify 'test' is gone but '$wwid' present ..."
-trun "multipath -ll"
-tok "multipath -ll | egrep \"^$wwid\""
-sleep 10
-tok "multipath -F $wwid"
-sleep 10
-trun "modprobe -r scsi_debug"
+do_reconfigure ()
+{
+    trun "cat /etc/multipath.conf"
+    tok "multipathd reconfigure"
+    sleep 5
+}
 
-trun "cp /etc/multipath.conf.$$ /etc/multipath.conf"
-trun "multipath -F; multipath"
+trun "rpm -q device-mapper-multipath || dnf install -y device-mapper-multipath"
+cleanup
+setup_config
+trun "rm -r /etc/multipath/bindings"
+trun "modprobe scsi_debug vpd_use_hostno=0 add_host=2"
+sleep 5
+trun "systemctl start multipathd.service"
+while multipathd show daemon | grep -qv idle; do
+    tlog "waiting for multipathd to start"
+    sleep 1
+done
+trun 'multipathd show maps raw format "%n %w"'
+# verify user_friendly_name
+tok 'multipathd show maps raw format "%n" | head -1 | grep -q mpath'
+wwid=`multipathd show maps raw format "%w" | head -1`
+assert "[[ -n $wwid ]] && [[ $wwid != ok ]]"
+sed -i 's/TEST_WWID/'"$wwid"'/' /etc/multipath.conf
+do_reconfigure
+trun 'multipathd show maps raw format "%n %w"'
+# verify configured alias takes precedence over user_friendly_name
+tok 'multipathd show maps raw format "%n" | head -1 | grep -q test'
+trun "mpathconf --user_friendly_names n"
+do_reconfigure
+trun 'multipathd show maps raw format "%n %w"'
+# verify configured alias takes precedence over wwid name
+tok 'multipathd show maps raw format "%n" | head -1 | grep -q test'
+sed -i 's/'"$wwid"'/TEST_WWID/' /etc/multipath.conf
+do_reconfigure
+trun 'multipathd show maps raw format "%n %w"'
+tok 'multipathd show maps raw format "%n" | head -1 | grep -q '"$wwid"
+cleanup
 tend
diff --git a/tests/user_friendly_names/multipath.conf.no b/tests/user_friendly_names/multipath.conf.no
deleted file mode 100644
index b916bfb..0000000
--- a/tests/user_friendly_names/multipath.conf.no
+++ /dev/null
@@ -1,3 +0,0 @@
-defaults {
-    user_friendly_names     no
-}
diff --git a/tests/user_friendly_names/multipath.conf.yes b/tests/user_friendly_names/multipath.conf.yes
deleted file mode 100644
index ffc21bb..0000000
--- a/tests/user_friendly_names/multipath.conf.yes
+++ /dev/null
@@ -1,11 +0,0 @@
-defaults {
-    user_friendly_names     yes
-}
-
-multipaths {
-   multipath {
-       wwid your_wwid
-       alias test
-   }
-}
-