diff --git a/README.config-sections b/README.config-sections
index 8c319ba9..4f1a4dc6 100644
--- a/README.config-sections
+++ b/README.config-sections
@@ -40,8 +40,8 @@ Different mount options
 -----------------------
 
 Specifying different mount options in difference config sections is allowed.
-When MOUNT_OPTIONS differs in the following section TEST_DEV will be remounted
-with new MOUNT_OPTIONS automatically before running the test.
+When TEST_FS_MOUNT_OPTS differs in the following section TEST_DEV will be
+remounted with new TEST_FS_MOUNT_OPTS automatically before running the test.
 
 
 Multiple file systems
@@ -51,9 +51,9 @@ Having different file systems in different config sections is allowed. When
 FSTYP differs in the following section the FSTYP file system will be created
 automatically before running the test.
 
-Note that if MOUNT_OPTIONS, MKFS_OPTIONS, or FSCK_OPTIONS are not directly
-specified in the section it will be reset to the default for a given file
-system.
+Note that if TEST_FS_MOUNT_OPTS, MOUNT_OPTIONS, MKFS_OPTIONS, or FSCK_OPTIONS
+are not directly specified in the section it will be reset to the default for a
+given file system.
 
 You can also force the file system recreation by specifying RECREATE_TEST_DEV.
 
diff --git a/common/config b/common/config
index 80598d06..d08d14b3 100644
--- a/common/config
+++ b/common/config
@@ -602,6 +602,7 @@ get_next_config() {
 	local OLD_USE_EXTERNAL=$USE_EXTERNAL
 
 	unset MOUNT_OPTIONS
+	unset TEST_FS_MOUNT_OPTS
 	unset MKFS_OPTIONS
 	unset FSCK_OPTIONS
 	unset USE_EXTERNAL