diff --git a/test/http2_test/http2_test_server.py b/test/http2_test/http2_test_server.py
index 35308c47874df0eff9f90bae2b5edb65dd712599..c74fc4b1fb97c3117a44411b6e75e37261bfecce 100644
--- a/test/http2_test/http2_test_server.py
+++ b/test/http2_test/http2_test_server.py
@@ -31,7 +31,7 @@ class H2Factory(Factory):
     elif self._testcase == 'ping':
       t = test_ping.TestcasePing()
     elif self._testcase == 'max_streams':
-      t = TestcaseSettingsMaxStreams(self._num_streams)
+      t = test_max_streams.TestcaseSettingsMaxStreams()
     else:
       logging.error('Unknown test case: %s'%self._testcase)
       assert(0)
diff --git a/test/http2_test/test_rst_after_data.py b/test/http2_test/test_rst_after_data.py
index c4ff56c889c37dce1b7ef6beedfcc1bd3e21c95d..30163c2cebbadf75112cae04345d0990f084d6b5 100644
--- a/test/http2_test/test_rst_after_data.py
+++ b/test/http2_test/test_rst_after_data.py
@@ -8,6 +8,7 @@ class TestcaseRstStreamAfterData(object):
   def __init__(self):
     self._base_server = http2_base_server.H2ProtocolBaseServer()
     self._base_server._handlers['DataReceived'] = self.on_data_received
+    self._base_server._handlers['SendDone'] = self.on_send_done
 
   def get_base_server(self):
     return self._base_server
@@ -20,4 +21,7 @@ class TestcaseRstStreamAfterData(object):
       self._ready_to_send = True
       self._base_server.setup_send(response_data, event.stream_id)
       # send reset stream
-      self._base_server.send_reset_stream()
+
+  def on_send_done(self, stream_id):
+    self._base_server.send_reset_stream()
+    self._base_server._stream_status[stream_id] = False