diff --git a/lib/util/time.c b/lib/util/time.c
index e6a0668cf90..cec91c14791 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -1128,10 +1128,10 @@ struct timespec nt_time_to_full_timespec(NTTIME nt)
 	if (nt == NTTIME_OMIT) {
 		return make_omit_timespec();
 	}
-	if (nt == NTTIME_FREEZE) {
+	if (nt == NTTIME_FREEZE || nt == NTTIME_THAW) {
 		/*
-		 * This should be returned as SAMBA_UTIME_FREEZE in the
-		 * future.
+		 * This should be returned as SAMBA_UTIME_FREEZE or
+		 * SAMBA_UTIME_THAW in the future.
 		 */
 		return make_omit_timespec();
 	}
diff --git a/selftest/knownfail.d/samba3.smb2.timestamps b/selftest/knownfail.d/samba3.smb2.timestamps
deleted file mode 100644
index d183ec1f583..00000000000
--- a/selftest/knownfail.d/samba3.smb2.timestamps
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.smb2.timestamps.freeze-thaw\(.*\)$