diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2b64ebf7f..3eb8bf0f1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -502,6 +502,7 @@ add_test_case(h2_client_error_from_incoming_headers_callback_reset_stream)
 add_test_case(h2_client_error_from_incoming_headers_done_callback_reset_stream)
 add_test_case(h2_client_error_from_incoming_body_callback_reset_stream)
 add_test_case(h2_client_manual_data_write)
+add_test_case(h2_client_manual_data_write_read_broken)
 add_test_case(h2_client_manual_data_write_not_enabled)
 add_test_case(h2_client_manual_data_write_with_body)
 add_test_case(h2_client_manual_data_write_no_data)
diff --git a/tests/py_localhost/server.py b/tests/py_localhost/server.py
index 3bdfc4c3f..8bd58cf17 100644
--- a/tests/py_localhost/server.py
+++ b/tests/py_localhost/server.py
@@ -308,7 +308,9 @@ def window_updated(self, stream_id, delta):
 ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
 ssl_context.options |= (ssl.OP_NO_COMPRESSION)
 ssl_context.load_cert_chain(
-    certfile="../resources/unittests.crt", keyfile="../resources/unittests.key")
+    certfile=os.path.join(os.path.dirname(__file__),
+                          "../resources/unittests.crt"),
+    keyfile=os.path.join(os.path.dirname(__file__), "../resources/unittests.key"))
 ssl_context.set_alpn_protocols(["h2"])
 
 loop = asyncio.new_event_loop()
diff --git a/tests/stream_test_helper.c b/tests/stream_test_helper.c
index 560d8ba86..c57073ff4 100644
--- a/tests/stream_test_helper.c
+++ b/tests/stream_test_helper.c
@@ -201,6 +201,7 @@ int client_stream_tester_init(
         .on_metrics = s_on_metrics,
         .on_complete = s_on_complete,
         .on_destroy = s_on_destroy,
+        .http2_use_manual_data_writes = options->http2_manual_write,
     };
     tester->stream = aws_http_connection_make_request(options->connection, &request_options);
     ASSERT_NOT_NULL(tester->stream);
diff --git a/tests/stream_test_helper.h b/tests/stream_test_helper.h
index 74af053ef..3b2ff0263 100644
--- a/tests/stream_test_helper.h
+++ b/tests/stream_test_helper.h
@@ -51,6 +51,7 @@ struct client_stream_tester {
 struct client_stream_tester_options {
     struct aws_http_message *request;
     struct aws_http_connection *connection;
+    bool http2_manual_write;
 };
 
 int client_stream_tester_init(
diff --git a/tests/test_h2_client.c b/tests/test_h2_client.c
index 4a59a5a27..f6c840090 100644
--- a/tests/test_h2_client.c
+++ b/tests/test_h2_client.c
@@ -5422,6 +5422,70 @@ TEST_CASE(h2_client_manual_data_write) {
     return s_tester_clean_up();
 }
 
+static void s_http_stream_write_complete_fn(struct aws_http_stream *stream, int error_code, void *user_data) {
+    (void)stream;
+    int *ctx = (int *)user_data;
+    *ctx = error_code;
+}
+
+TEST_CASE(h2_client_manual_data_write_read_broken) {
+
+    ASSERT_SUCCESS(s_tester_init(allocator, ctx));
+    /* get connection preface and acks out of the way */
+    ASSERT_SUCCESS(h2_fake_peer_send_connection_preface_default_settings(&s_tester.peer));
+    ASSERT_SUCCESS(h2_fake_peer_decode_messages_from_testing_channel(&s_tester.peer));
+
+    struct aws_http_message *request = aws_http2_message_new_request(allocator);
+    ASSERT_NOT_NULL(request);
+
+    struct aws_http_header request_headers_src[] = {
+        DEFINE_HEADER(":method", "POST"),
+        DEFINE_HEADER(":scheme", "https"),
+        DEFINE_HEADER(":path", "/"),
+    };
+    aws_http_message_add_header_array(request, request_headers_src, AWS_ARRAY_SIZE(request_headers_src));
+    struct client_stream_tester stream_tester;
+
+    struct client_stream_tester_options options = {
+        .request = request,
+        .connection = s_tester.connection,
+        .http2_manual_write = true,
+    };
+    ASSERT_SUCCESS(client_stream_tester_init(&stream_tester, s_tester.alloc, &options));
+    struct aws_http_stream *stream = stream_tester.stream;
+    ASSERT_NOT_NULL(stream);
+
+    testing_channel_drain_queued_tasks(&s_tester.testing_channel);
+
+    struct aws_input_stream *data_stream = aws_input_stream_new_tester(allocator, aws_byte_cursor_from_c_str("abcd"));
+    aws_input_stream_tester_set_reading_broken(data_stream, true);
+    int error_code = 0;
+    struct aws_http2_stream_write_data_options write = {
+        .data = data_stream,
+        .on_complete = s_http_stream_write_complete_fn,
+        .user_data = &error_code,
+    };
+
+    ASSERT_SUCCESS(aws_http2_stream_write_data(stream, &write));
+    aws_input_stream_release(data_stream);
+
+    testing_channel_drain_queued_tasks(&s_tester.testing_channel);
+    ASSERT_TRUE(stream_tester.complete);
+    /* The stream complete will get the error code from the input stream read. */
+    ASSERT_UINT_EQUALS(stream_tester.on_complete_error_code, AWS_IO_STREAM_READ_FAILED);
+    /* The write triggers the stream to complete with error, so the write failed as the stream completes. */
+    ASSERT_UINT_EQUALS(error_code, AWS_ERROR_HTTP_STREAM_HAS_COMPLETED);
+
+    aws_http_message_release(request);
+
+    /* close the connection */
+    aws_http_connection_close(s_tester.connection);
+    client_stream_tester_clean_up(&stream_tester);
+
+    /* clean up */
+    return s_tester_clean_up();
+}
+
 TEST_CASE(h2_client_manual_data_write_not_enabled) {
 
     ASSERT_SUCCESS(s_tester_init(allocator, ctx));