diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h
index 3ca1bf8030..c3893d73e5 100644
--- a/tests/streams/bstream.h
+++ b/tests/streams/bstream.h
@@ -135,6 +135,9 @@ protected:
         // Travel to the end of the stream.
         while(!stream_in.Eof())
         {
+            CPPUNIT_ASSERT_MESSAGE( "unexpected non-EOF stream error",
+                                    stream_in.IsOk() );
+
             // Read, we move one byte along.
             (void)stream_in.GetC();
 #if 0