diff --git a/source4/torture/smb2/mangle.c b/source4/torture/smb2/mangle.c
index 09097ee6d78..09eddd26556 100644
--- a/source4/torture/smb2/mangle.c
+++ b/source4/torture/smb2/mangle.c
@@ -264,6 +264,7 @@ static bool test_mangled_mask(struct torture_context *tctx,
 
 	smb2_deltree(tree, dname);
 
+	/* Create dname and fname */
 	status = torture_smb2_testdir(tree, dname, &dh);
 	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
 					"torture_smb2_testdir failed");
@@ -271,6 +272,13 @@ static bool test_mangled_mask(struct torture_context *tctx,
 	status = torture_smb2_testfile(tree, fname, &fh);
 	smb2_util_close(tree, fh);
 
+	smb2_util_close(tree, dh);
+
+	/* Update the directory handle, that readdir() can see the testfile */
+	status = torture_smb2_testdir(tree, dname, &dh);
+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+					"torture_smb2_testdir failed");
+
 	ZERO_STRUCT(f);
 	f.in.file.handle	= dh;
 	f.in.pattern		= "*";