diff --git a/test/uchardet-tests.c b/test/uchardet-tests.c
index b39c80c..71880b0 100644
--- a/test/uchardet-tests.c
+++ b/test/uchardet-tests.c
@@ -52,9 +52,11 @@ detect(FILE *fp)
     char        buffer[BUFFER_SIZE];
     int         i;
 
-    while (!feof(fp))
+    while (1)
     {
         size_t len = fread(buffer, 1, BUFFER_SIZE, fp);
+        if (len == 0)
+            break;
         int retval = uchardet_handle_data(handle, buffer, len);
         if (retval != 0)
         {