diff --git a/test/lib/brick-shelltest.h b/test/lib/brick-shelltest.h
index 0b1f9dfee..6bc02e0d2 100644
--- a/test/lib/brick-shelltest.h
+++ b/test/lib/brick-shelltest.h
@@ -424,7 +424,8 @@ struct FdSink : Sink {
     {
         TimedBuffer::Line line = stream.shift( force );
         std::string out = fmt.format( line );
-        write( fd, out.c_str(), out.length() );
+        if ( write( fd, out.c_str(), out.length() ) < (int)out.length() )
+            perror( "short write" );
     }
 
     virtual void sync( bool force ) {
diff --git a/test/lib/not.c b/test/lib/not.c
index a5c52a8e6..0cff13062 100644
--- a/test/lib/not.c
+++ b/test/lib/not.c
@@ -86,7 +86,11 @@ int main(int args, char **argv) {
 		/* should not be accessible */
 		return FAILURE;
 	} else {		/* parent */
-		waitpid(pid, &status, 0);
+		if (waitpid(pid, &status, 0) < 0) {
+			fprintf(stderr, "Process %d failed on waitpid.\n", pid);
+			return FAILURE;
+		}
+
 		if (!WIFEXITED(status)) {
 			if (WIFSIGNALED(status))
 				fprintf(stderr,