diff --git a/selftest/knownfail.d/virusscanner b/selftest/knownfail.d/virusscanner
deleted file mode 100644
index 9bcaae7b4d1..00000000000
--- a/selftest/knownfail.d/virusscanner
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.blackbox.virus_scanner.check_infected_read\(fileserver:local\)
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 87684b1984d..792e9424bdc 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -1058,9 +1058,9 @@ next:
 	}
 
 	if (dirfsp != conn->cwd_fsp) {
-		dirfsp->fsp_name = NULL;
 		SMB_ASSERT(fsp_get_pathref_fd(dirfsp) != -1);
 		fd_close(dirfsp);
+		dirfsp->fsp_name = NULL;
 		file_free(NULL, dirfsp);
 		dirfsp = NULL;
 	}
@@ -1122,9 +1122,9 @@ fail:
 	}
 
 	if ((dirfsp != NULL) && (dirfsp != conn->cwd_fsp)) {
-		dirfsp->fsp_name = NULL;
 		SMB_ASSERT(fsp_get_pathref_fd(dirfsp) != -1);
 		fd_close(dirfsp);
+		dirfsp->fsp_name = NULL;
 		file_free(NULL, dirfsp);
 		dirfsp = NULL;
 	}