diff --git a/src/tests/test_auth.zig b/src/tests/test_auth.zig
index 5e5f262..ad325b4 100644
--- a/src/tests/test_auth.zig
+++ b/src/tests/test_auth.zig
@@ -146,22 +146,21 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8, auth: ?ClientAuthReqHeader
     var http_client: std.http.Client = .{ .allocator = a };
     defer http_client.deinit();
 
-    var req = try http_client.request(.GET, uri, h, .{});
+    // Note: you could/should consider setting the buffer size here
+    var req = try http_client.fetch(a, .{
+        .location = .{ .uri = uri },
+        .method = .GET,
+        .headers = h,
+    });
     defer req.deinit();
 
-    try req.start();
-    try req.wait();
-    // req.deinit() panics!
-    // defer req.deinit();
-
     // without this block, the tests sometimes get stuck which
     // might have to do with connection pooling and connections being in
     // a different state when all data has been read?!?
     {
-        var buffer: [1024]u8 = undefined;
-        // we know we won't receive a lot
-        const len = try req.reader().readAll(&buffer);
-        std.debug.print("RESPONSE:\n{s}\n", .{buffer[0..len]});
+        if (req.body) |body| {
+            std.debug.print("RESPONSE:\n{s}\n", .{body});
+        }
     }
 
     zap.stop();
diff --git a/src/tests/test_http_params.zig b/src/tests/test_http_params.zig
index c5e3387..f18014e 100644
--- a/src/tests/test_http_params.zig
+++ b/src/tests/test_http_params.zig
@@ -10,11 +10,13 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8) !void {
     var http_client: std.http.Client = .{ .allocator = a };
     defer http_client.deinit();
 
-    var req = try http_client.request(.GET, uri, h, .{});
+    var req = try http_client.fetch(a, .{
+        .location = .{ .uri = uri },
+        .method = .GET,
+        .headers = h,
+    });
     defer req.deinit();
 
-    try req.start();
-    try req.wait();
     zap.stop();
 }
 
@@ -23,7 +25,7 @@ fn makeRequestThread(a: std.mem.Allocator, url: []const u8) !std.Thread {
 }
 
 test "http parameters" {
-    var allocator = std.testing.allocator;
+    const allocator = std.testing.allocator;
 
     const Handler = struct {
         var alloc: std.mem.Allocator = undefined;
diff --git a/src/tests/test_sendfile.zig b/src/tests/test_sendfile.zig
index 51064cf..abb1e4c 100644
--- a/src/tests/test_sendfile.zig
+++ b/src/tests/test_sendfile.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const zap = @import("zap");
 
-var buffer: [1024]u8 = undefined;
+var buffer: []u8 = undefined;
 var read_len: ?usize = null;
 
 const testfile = @embedFile("testfile.txt");
@@ -15,12 +15,17 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8) !void {
     var http_client: std.http.Client = .{ .allocator = a };
     defer http_client.deinit();
 
-    var req = try http_client.request(.GET, uri, h, .{});
+    var req = try http_client.fetch(a, .{
+        .location = .{ .uri = uri },
+        .method = .GET,
+        .headers = h,
+    });
     defer req.deinit();
 
-    try req.start();
-    try req.wait();
-    read_len = try req.readAll(&buffer);
+    if (req.body) |body| {
+        read_len = body.len;
+        buffer = try a.dupe(u8, body);
+    }
 
     zap.stop();
 }
@@ -33,7 +38,7 @@ pub fn on_request(r: zap.Request) void {
 }
 
 test "send file" {
-    var allocator = std.testing.allocator;
+    const allocator = std.testing.allocator;
 
     // setup listener
     var listener = zap.HttpListener.init(
@@ -56,6 +61,7 @@ test "send file" {
     });
 
     if (read_len) |rl| {
+        defer allocator.free(buffer);
         try std.testing.expectEqual(testfile.len, rl);
         try std.testing.expectEqualSlices(u8, testfile, buffer[0..rl]);
     } else {