diff --git a/src/aws.zig b/src/aws.zig
index d0db16e..43dee02 100644
--- a/src/aws.zig
+++ b/src/aws.zig
@@ -1591,10 +1591,11 @@ const TestOptions = struct {
         return error.HeaderOrValueNotFound;
     }
     fn waitForReady(self: *Self) !void {
-        // While this doesn't return an error, we can use !void
-        // to prepare for addition of timeout
-        while (!self.server_ready)
+        // Set 1 minute timeout...this is way longer than necessary
+        var remaining_iters: isize = std.time.ns_per_min / 100;
+        while (!self.server_ready and remaining_iters > 0) : (remaining_iters -= 1)
             std.time.sleep(100);
+        if (!self.server_ready) return error.TestServerTimeoutWaitingForReady;
     }
 };
 
@@ -1622,6 +1623,7 @@ fn threadMain(options: *TestOptions) !void {
     // var aa = arena.allocator();
     // We're in control of all requests/responses, so this flag will tell us
     // when it's time to shut down
+    defer options.server_ready = true; // In case remaining_requests = 0, we don't want to wait forever
     while (options.server_remaining_requests > 0) {
         options.server_remaining_requests -= 1;
         processRequest(options, &http_server) catch |e| {