diff --git a/tests/data/test517 b/tests/data/test517
index c38f41cc8..7a8bf2914 100644
--- a/tests/data/test517
+++ b/tests/data/test517
@@ -47,6 +47,13 @@ nothing
 19: Sat, 11 Sep 2004 21:32:11 +0200 => 1094931131
 20: 20040912 15:05:58 -0700 => 1095026758
 21: 20040911 +0200 => 1094853600
-22: 2094 Nov 6 => 2147483647
 </stdout>
+
+# This test case previously testes an overflow case ("2094 Nov 6 =>
+# 2147483647") for 32bit time_t, but since some systems have 64bit time_t and
+# handles this (returning 3939840000), and some 64bit-time_t systems don't
+# handle this and returns -1 for this, it turned very tricky to write a fine
+# test case and thus it is now removed until we have a way to write test cases
+# for this kind of things.
+
 </verify>
diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c
index ea296914f..1a4aefc54 100644
--- a/tests/libtest/lib517.c
+++ b/tests/libtest/lib517.c
@@ -23,7 +23,7 @@ const char *dates[]={
   "Sat, 11 Sep 2004 21:32:11 +0200",
   "20040912 15:05:58 -0700",
   "20040911 +0200",
-  "2094 Nov 6",
+/*  "2094 Nov 6", See ../data/test517 for details */
   NULL
 };