diff --git a/crypto/fipsmodule/rand/urandom.c b/crypto/fipsmodule/rand/urandom.c
index 474c4bcd0..7f7614503 100644
--- a/crypto/fipsmodule/rand/urandom.c
+++ b/crypto/fipsmodule/rand/urandom.c
@@ -166,7 +166,6 @@ static void init_once(void) {
    * continuing. This is automatically handled by getrandom, which requires
    * that the entropy pool has been initialised, but for urandom we have to
    * poll. */
-  int first_iteration = 1;
   for (;;) {
     int entropy_bits;
     if (ioctl(fd, RNDGETENTCNT, &entropy_bits)) {
@@ -181,14 +180,6 @@ static void init_once(void) {
       break;
     }
 
-    if (first_iteration) {
-      message(
-          "The kernel entropy pool contains too few bits. This process is "
-          "built in FIPS mode and will block until sufficient entropy is "
-          "available.\n");
-    }
-    first_iteration = 0;
-
     usleep(250000);
   }
 #endif
diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go
index 378ac57a8..cdef60c2b 100644
--- a/ssl/test/runner/runner.go
+++ b/ssl/test/runner/runner.go
@@ -1106,10 +1106,7 @@ func runTest(test *testCase, shimPath string, mallocNumToFail int64) error {
 	}
 
 	if len(extraStderr) > 0 || (!failed && len(stderr) > 0) {
-		lines := strings.Split(stderr, "\n")
-		if len(lines) != 2 || lines[1] != "" || !strings.Contains(lines[0], "The kernel entropy pool contains too few bits") {
-			return fmt.Errorf("unexpected error output:\n%s\n%s", stderr, extraStderr)
-		}
+		return fmt.Errorf("unexpected error output:\n%s\n%s", stderr, extraStderr)
 	}
 
 	if *useValgrind && isValgrindError {