diff --git a/src/test/pmempool_info/out24.log.match b/src/test/pmempool_info/out24.log.match
index 8e10260c25ecac2392be921f23bcfc126fcf4368..0030541f7f8422f78a403015e38dfdc30caae707 100644
--- a/src/test/pmempool_info/out24.log.match
+++ b/src/test/pmempool_info/out24.log.match
@@ -8,7 +8,7 @@ part 0:
 path                     : /dev/dax$(N).$(N)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 bad blocks:
 	offset		length
 	16		8
diff --git a/src/test/pmempool_sync/out28.log.match b/src/test/pmempool_sync/out28.log.match
index ca05e5d0652073018d84ce3bfcfea4f5c5e4fecd..e06d85dfd166d3b6749567d4f6d2be29bfb5d74a 100644
--- a/src/test/pmempool_sync/out28.log.match
+++ b/src/test/pmempool_sync/out28.log.match
@@ -26,7 +26,7 @@ part 0:
 path                     : /dev/dax$(N).$(N)
 type                     : device dax
 size                     : $(N)
-alignment                : 4096
+alignment                : $(N)
 Replica 1 - local, 1 part(s):
 part 0:
 path                     : $(nW)/testfile1
diff --git a/src/test/pmempool_sync/out31.log.match b/src/test/pmempool_sync/out31.log.match
index 9306d9594826a983bbd6a30236e82ed334ff85e0..a930f6272e73de6fa3b446d9b066b6a9e0a5de88 100644
--- a/src/test/pmempool_sync/out31.log.match
+++ b/src/test/pmempool_sync/out31.log.match
@@ -11,7 +11,7 @@ part 0:
 path                     : /dev/dax$(N).$(N)
 type                     : device dax
 size                     : $(N)
-alignment                : 4096
+alignment                : $(N)
 bad blocks:
 	offset		length
 	1000		8
@@ -74,7 +74,7 @@ part 0:
 path                     : /dev/dax$(N).$(N)
 type                     : device dax
 size                     : $(N)
-alignment                : 4096
+alignment                : $(N)
 Replica 1 - local, 1 part(s):
 part 0:
 path                     : $(nW)/testfile1
diff --git a/src/test/pmempool_transform/out18.log.match b/src/test/pmempool_transform/out18.log.match
index 8fc845fc3f49f88433df147dce7285fcdfb67177..4b5fa80a884f24fac5776659ce0a2fbd642be2ac 100644
--- a/src/test/pmempool_transform/out18.log.match
+++ b/src/test/pmempool_transform/out18.log.match
@@ -29,12 +29,12 @@ part 0:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 part 1:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 Replica 1 - local, 2 part(s):
 part 0:
 path                     : $(nW)part00
diff --git a/src/test/pmempool_transform_remote/node_0_out11.log.match b/src/test/pmempool_transform_remote/node_0_out11.log.match
index 6a26682bf67004e88fa3c1f575f1b4d01fc0eb6d..bfd51b85c2658c08bd255a6f0a7533d8403bb028 100644
--- a/src/test/pmempool_transform_remote/node_0_out11.log.match
+++ b/src/test/pmempool_transform_remote/node_0_out11.log.match
@@ -2,7 +2,7 @@ Part file:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 
 POOL Header:
 Signature                : PMEMOBJ [part file]
diff --git a/src/test/pmempool_transform_remote/node_0_out6.log.match b/src/test/pmempool_transform_remote/node_0_out6.log.match
index 6a26682bf67004e88fa3c1f575f1b4d01fc0eb6d..bfd51b85c2658c08bd255a6f0a7533d8403bb028 100644
--- a/src/test/pmempool_transform_remote/node_0_out6.log.match
+++ b/src/test/pmempool_transform_remote/node_0_out6.log.match
@@ -2,7 +2,7 @@ Part file:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 
 POOL Header:
 Signature                : PMEMOBJ [part file]
diff --git a/src/test/pmempool_transform_remote/node_0_out7.log.match b/src/test/pmempool_transform_remote/node_0_out7.log.match
index 6a26682bf67004e88fa3c1f575f1b4d01fc0eb6d..bfd51b85c2658c08bd255a6f0a7533d8403bb028 100644
--- a/src/test/pmempool_transform_remote/node_0_out7.log.match
+++ b/src/test/pmempool_transform_remote/node_0_out7.log.match
@@ -2,7 +2,7 @@ Part file:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 
 POOL Header:
 Signature                : PMEMOBJ [part file]
diff --git a/src/test/pmempool_transform_remote/node_1_out13.log.match b/src/test/pmempool_transform_remote/node_1_out13.log.match
index b8cd08e3a4bbea17216b9963762e3ea90b9899e9..00dc688da5e69b3bfc5b20fb0fb00f265de7a2b9 100644
--- a/src/test/pmempool_transform_remote/node_1_out13.log.match
+++ b/src/test/pmempool_transform_remote/node_1_out13.log.match
@@ -5,12 +5,12 @@ part 0:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 part 1:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 Replica 1 - remote:
 node                     : $(nW)
 pool set                 : poolset.remote
@@ -45,7 +45,7 @@ Part file:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 
 POOL Header:
 Signature                : PMEMOBJ [part file]
diff --git a/src/test/pmempool_transform_remote/node_1_out15.log.match b/src/test/pmempool_transform_remote/node_1_out15.log.match
index c0d86e35493615ff7a2c1839f63ee12e49e92618..0290e5c6f36ad19bf6191ae9a69d445d64b65341 100644
--- a/src/test/pmempool_transform_remote/node_1_out15.log.match
+++ b/src/test/pmempool_transform_remote/node_1_out15.log.match
@@ -5,12 +5,12 @@ part 0:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 part 1:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 
 Poolset options:
 SINGLEHDR
@@ -42,7 +42,7 @@ Part file:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 
 POOL Header:
 Signature                : PMEMOBJ
diff --git a/src/test/pmempool_transform_remote/node_1_out19.log.match b/src/test/pmempool_transform_remote/node_1_out19.log.match
index c0d86e35493615ff7a2c1839f63ee12e49e92618..0290e5c6f36ad19bf6191ae9a69d445d64b65341 100644
--- a/src/test/pmempool_transform_remote/node_1_out19.log.match
+++ b/src/test/pmempool_transform_remote/node_1_out19.log.match
@@ -5,12 +5,12 @@ part 0:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 part 1:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 
 Poolset options:
 SINGLEHDR
@@ -42,7 +42,7 @@ Part file:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 
 POOL Header:
 Signature                : PMEMOBJ
diff --git a/src/test/pmempool_transform_remote/node_1_out6.log.match b/src/test/pmempool_transform_remote/node_1_out6.log.match
index b8cd08e3a4bbea17216b9963762e3ea90b9899e9..00dc688da5e69b3bfc5b20fb0fb00f265de7a2b9 100644
--- a/src/test/pmempool_transform_remote/node_1_out6.log.match
+++ b/src/test/pmempool_transform_remote/node_1_out6.log.match
@@ -5,12 +5,12 @@ part 0:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 part 1:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 Replica 1 - remote:
 node                     : $(nW)
 pool set                 : poolset.remote
@@ -45,7 +45,7 @@ Part file:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 
 POOL Header:
 Signature                : PMEMOBJ [part file]
diff --git a/src/test/pmempool_transform_remote/node_1_out8.log.match b/src/test/pmempool_transform_remote/node_1_out8.log.match
index b8cd08e3a4bbea17216b9963762e3ea90b9899e9..00dc688da5e69b3bfc5b20fb0fb00f265de7a2b9 100644
--- a/src/test/pmempool_transform_remote/node_1_out8.log.match
+++ b/src/test/pmempool_transform_remote/node_1_out8.log.match
@@ -5,12 +5,12 @@ part 0:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 part 1:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 Replica 1 - remote:
 node                     : $(nW)
 pool set                 : poolset.remote
@@ -45,7 +45,7 @@ Part file:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 
 POOL Header:
 Signature                : PMEMOBJ [part file]
diff --git a/src/test/pmempool_transform_remote/node_1_out9.log.match b/src/test/pmempool_transform_remote/node_1_out9.log.match
index 30fcba6f54bff7fb0cec2fbf72751017e3a80a74..aff27d34ca3d111de2936ab51e03ec1d5800688f 100644
--- a/src/test/pmempool_transform_remote/node_1_out9.log.match
+++ b/src/test/pmempool_transform_remote/node_1_out9.log.match
@@ -5,7 +5,7 @@ part 0:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 part 1:
 path                     : $(nW)
 type                     : device dax
@@ -45,7 +45,7 @@ Part file:
 path                     : $(nW)
 type                     : device dax
 size                     : $(nW)
-alignment                : 4096
+alignment                : $(N)
 
 POOL Header:
 Signature                : PMEMOBJ [part file]