diff --git a/tests/unit/mr/mr-reg.c b/tests/unit/mr/mr-reg.c
index dead9cbeca..0861a8a3e9 100644
--- a/tests/unit/mr/mr-reg.c
+++ b/tests/unit/mr/mr-reg.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2020, Intel Corporation */
+/* Copyright 2020-2021, Intel Corporation */
 
 /*
  * mr-reg.c -- the memory region registration/deregistration unit tests
@@ -24,33 +24,8 @@ static struct prestate prestates[] = {
 	/* values used in reg_dereg__success called with (prestates + 0) */
 	{RPMA_MR_USAGE_READ_SRC, IBV_ACCESS_REMOTE_READ, NULL},
 	/* values used in reg_dereg__success called with (prestates + 1) */
-	{RPMA_MR_USAGE_READ_DST, IBV_ACCESS_LOCAL_WRITE, NULL},
-	/* values used in reg_dereg__success called with (prestates + 2) */
 	{(RPMA_MR_USAGE_READ_SRC | RPMA_MR_USAGE_READ_DST),
 		(IBV_ACCESS_REMOTE_READ | IBV_ACCESS_LOCAL_WRITE), NULL},
-	/* values used in reg_dereg__success called with (prestates + 3) */
-	{RPMA_MR_USAGE_WRITE_SRC, IBV_ACCESS_LOCAL_WRITE, NULL},
-	/* values used in reg_dereg__success called with (prestates + 4) */
-	{RPMA_MR_USAGE_WRITE_DST,
-		(IBV_ACCESS_REMOTE_WRITE | IBV_ACCESS_LOCAL_WRITE), NULL},
-	/* values used in reg_dereg__success called with (prestates + 5) */
-	{RPMA_MR_USAGE_FLUSH_TYPE_PERSISTENT, IBV_ACCESS_REMOTE_READ, NULL},
-	/* values used in reg_dereg__success called with (prestates + 6) */
-	{(RPMA_MR_USAGE_WRITE_SRC | RPMA_MR_USAGE_WRITE_DST |
-	RPMA_MR_USAGE_FLUSH_TYPE_PERSISTENT),
-		(IBV_ACCESS_REMOTE_WRITE | IBV_ACCESS_LOCAL_WRITE |
-		IBV_ACCESS_REMOTE_READ), NULL},
-	/* values used in reg_dereg__success called with (prestates + 7) */
-	{RPMA_MR_USAGE_RECV, IBV_ACCESS_LOCAL_WRITE, NULL},
-	/* values used in reg_dereg__success called with (prestates + 8) */
-	{RPMA_MR_USAGE_SEND, 0, NULL},
-	/* values used in reg_dereg__success called with (prestates + 9) */
-	{(RPMA_MR_USAGE_READ_SRC | RPMA_MR_USAGE_READ_DST |
-	RPMA_MR_USAGE_WRITE_SRC | RPMA_MR_USAGE_WRITE_DST |
-	RPMA_MR_USAGE_RECV | RPMA_MR_USAGE_SEND |
-	RPMA_MR_USAGE_FLUSH_TYPE_PERSISTENT),
-		(IBV_ACCESS_REMOTE_READ | IBV_ACCESS_REMOTE_WRITE |
-		IBV_ACCESS_LOCAL_WRITE), NULL},
 };
 
 /*
@@ -285,32 +260,14 @@ static const struct CMUnitTest tests_reg[] = {
 	cmocka_unit_test(reg__wrong_usage),
 	cmocka_unit_test(reg__failed_E_NOMEM),
 	cmocka_unit_test(reg__peer_mr_reg_failed_E_PROVIDER),
-	{ "reg_dereg__USAGE_READ_SRC", reg_dereg__success,
-		setup__reg_success, teardown__dereg_success, prestates + 0},
-	{ "reg_dereg__USAGE_READ_DST", reg_dereg__success,
-		setup__reg_success, teardown__dereg_success, prestates + 1},
-	{ "reg_dereg__USAGE_READ_SRC_DST", reg_dereg__success,
-		setup__reg_success, teardown__dereg_success, prestates + 2},
-	{ "reg_dereg__USAGE_WRITE_SRC", reg_dereg__success,
-		setup__reg_success, teardown__dereg_success, prestates + 3},
-	{ "reg_dereg__USAGE_WRITE_DST", reg_dereg__success,
-		setup__reg_success, teardown__dereg_success, prestates + 4},
-	{ "reg_dereg__USAGE_FLUSHABLE", reg_dereg__success,
-		setup__reg_success, teardown__dereg_success, prestates + 5},
-	{ "reg_dereg__USAGE_WRITE_SRC_DST_FLUSHABLE", reg_dereg__success,
-		setup__reg_success, teardown__dereg_success, prestates + 6},
-	{ "reg_dereg__USAGE_RECV", reg_dereg__success,
-		setup__reg_success, teardown__dereg_success, prestates + 7},
-	{ "reg_dereg__USAGE_SEND", reg_dereg__success,
-		setup__reg_success, teardown__dereg_success, prestates + 8},
-	{ "reg_dereg__USAGE_ALL", reg_dereg__success,
-		setup__reg_success, teardown__dereg_success, prestates + 9},
+	cmocka_unit_test_prestate_setup_teardown(reg_dereg__success,
+		setup__reg_success, teardown__dereg_success, prestates),
 
 	/* rpma_mr_dereg() unit tests */
 	cmocka_unit_test(dereg__NULL_mr_ptr),
 	cmocka_unit_test(dereg__NULL_mr),
 	cmocka_unit_test_prestate(dereg__failed_E_PROVIDER,
-		prestates + 2),
+		prestates + 1),
 	cmocka_unit_test(NULL)
 };