diff --git a/lib/HttpClient/CurlClient.php b/lib/HttpClient/CurlClient.php
index 2139999a98..2133522000 100644
--- a/lib/HttpClient/CurlClient.php
+++ b/lib/HttpClient/CurlClient.php
@@ -390,8 +390,7 @@ public function executeStreamingRequestWithRetries($opts, $absUrl, $readBodyChun
             &$numRetries,
             &$rcode,
             &$lastRHeaders,
-            &$errno,
-            &$message
+            &$errno
         ) {
             $lastRHeaders = $rheaders;
             $errno = \curl_errno($this->curlHandle);
diff --git a/tests/Stripe/HttpClient/CurlClientTest.php b/tests/Stripe/HttpClient/CurlClientTest.php
index ea0079439a..ded791e11b 100644
--- a/tests/Stripe/HttpClient/CurlClientTest.php
+++ b/tests/Stripe/HttpClient/CurlClientTest.php
@@ -381,11 +381,12 @@ public function tearDownTestServer()
     // if this flakes.
     public function testExecuteRequestWithRetriesCallsWriteFunctionWithChunks()
     {
-        $chunk1 = 'First, bytes';
-        $chunk2 = 'more bytes';
-        $chunk3 = 'final bytes';
+        $chunk1 = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+        $chunk2 = 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb';
+        $chunk3 = 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc';
         $serverCode = <<<EOF
 <?php
+ob_end_flush();
 echo "{$chunk1}";
 ob_flush();
 flush();
@@ -492,7 +493,7 @@ public function testExecuteStreamingRequestWithRetriesPersistentConnection()
         $curl = new CurlClient();
         $coupon = \Stripe\Coupon::retrieve('coupon_xyz');
 
-        $absUrl = \Stripe\Stripe::$apiBase . "/v1/coupons/xyz";
+        $absUrl = \Stripe\Stripe::$apiBase . '/v1/coupons/xyz';
         $opts[\CURLOPT_HTTPGET] = 1;
         $opts[\CURLOPT_URL] = $absUrl;
         $opts[\CURLOPT_HTTPHEADER] = ['Authorization: Basic c2tfdGVzdF94eXo6'];
diff --git a/tests/TestServer.php b/tests/TestServer.php
index a653b9ae18..09e34eda68 100644
--- a/tests/TestServer.php
+++ b/tests/TestServer.php
@@ -24,17 +24,18 @@ trait TestServer
     // value to `stripe-mock`'s standard 12111.
     protected $serverPort = 12113;
 
-
     private function lint($path)
     {
-      $output = '';
-      $exitCode = null;
-      \exec("php -l {$path}", $output, $exitCode);
-      if (0 !== $exitCode) {
-          $text = \implode("\n", $output);
-          throw new \Exception("Error in test server code: {$text}");
-      }
+        $output = '';
+        $exitCode = null;
+        \exec("php -l {$path}", $output, $exitCode);
+        if (0 !== $exitCode) {
+            $text = \implode("\n", $output);
+
+            throw new \Exception("Error in test server code: {$text}");
+        }
     }
+
     /**
      * Makes a directory in a temporary path containing only an `index.php` file with
      * the specified content ($code).
@@ -59,6 +60,7 @@ private function makeTemporaryServerDirectory($code)
         \fclose($handle);
 
         $this->lint($indexPHP);
+
         return $dir;
     }
 
@@ -129,9 +131,6 @@ public function stopTestServer()
         foreach ($lines as $line) {
             if (self::isPHPTestServerRequestLogLine($line)) {
                 ++$n;
-            } else {
-                \flush();
-                \ob_flush();
             }
         }