diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
index d608a4064..8e20600f7 100644
--- a/codegen/template_bundle/template_files.go
+++ b/codegen/template_bundle/template_files.go
@@ -2033,7 +2033,7 @@ func (m *mockService) Stop() {
 	// m.ctrl.Finish() calls runtime.Goexit() on errors
 	// put it in defer so cleanup is always done
 	defer func(){
-		m.server.Close()
+		m.server.Shutdown()
 		m.started = false
 	}()
 	m.ctrl.Finish()
@@ -2099,7 +2099,7 @@ func service_mockTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "service_mock.tmpl", size: 4885, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
+	info := bindataFileInfo{name: "service_mock.tmpl", size: 4888, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/codegen/templates/service_mock.tmpl b/codegen/templates/service_mock.tmpl
index 56349b20f..b9ab39c63 100644
--- a/codegen/templates/service_mock.tmpl
+++ b/codegen/templates/service_mock.tmpl
@@ -130,7 +130,7 @@ func (m *mockService) Stop() {
 	// m.ctrl.Finish() calls runtime.Goexit() on errors
 	// put it in defer so cleanup is always done
 	defer func(){
-		m.server.Close()
+		m.server.Shutdown()
 		m.started = false
 	}()
 	m.ctrl.Finish()
diff --git a/examples/example-gateway/build/app/demo/services/xyz/mock-service/mock_service.go b/examples/example-gateway/build/app/demo/services/xyz/mock-service/mock_service.go
index 0e12e8508..b4638afa6 100644
--- a/examples/example-gateway/build/app/demo/services/xyz/mock-service/mock_service.go
+++ b/examples/example-gateway/build/app/demo/services/xyz/mock-service/mock_service.go
@@ -146,7 +146,7 @@ func (m *mockService) Stop() {
 	// m.ctrl.Finish() calls runtime.Goexit() on errors
 	// put it in defer so cleanup is always done
 	defer func() {
-		m.server.Close()
+		m.server.Shutdown()
 		m.started = false
 	}()
 	m.ctrl.Finish()
diff --git a/examples/example-gateway/build/services/echo-gateway/mock-service/mock_service.go b/examples/example-gateway/build/services/echo-gateway/mock-service/mock_service.go
index 7d314d2ab..196280d79 100644
--- a/examples/example-gateway/build/services/echo-gateway/mock-service/mock_service.go
+++ b/examples/example-gateway/build/services/echo-gateway/mock-service/mock_service.go
@@ -146,7 +146,7 @@ func (m *mockService) Stop() {
 	// m.ctrl.Finish() calls runtime.Goexit() on errors
 	// put it in defer so cleanup is always done
 	defer func() {
-		m.server.Close()
+		m.server.Shutdown()
 		m.started = false
 	}()
 	m.ctrl.Finish()
diff --git a/examples/example-gateway/build/services/example-gateway/mock-service/mock_service.go b/examples/example-gateway/build/services/example-gateway/mock-service/mock_service.go
index a65ad5d5a..29d9c558d 100644
--- a/examples/example-gateway/build/services/example-gateway/mock-service/mock_service.go
+++ b/examples/example-gateway/build/services/example-gateway/mock-service/mock_service.go
@@ -146,7 +146,7 @@ func (m *mockService) Stop() {
 	// m.ctrl.Finish() calls runtime.Goexit() on errors
 	// put it in defer so cleanup is always done
 	defer func() {
-		m.server.Close()
+		m.server.Shutdown()
 		m.started = false
 	}()
 	m.ctrl.Finish()
diff --git a/test/endpoints/tchannel/baz/baz_simpleservice_method_call_test.go b/test/endpoints/tchannel/baz/baz_simpleservice_method_call_test.go
index 3a16f4ef2..010743c39 100644
--- a/test/endpoints/tchannel/baz/baz_simpleservice_method_call_test.go
+++ b/test/endpoints/tchannel/baz/baz_simpleservice_method_call_test.go
@@ -252,8 +252,6 @@ func TestCallTChannelTimeout(t *testing.T) {
 	assert.Nil(t, resHeaders)
 	assert.False(t, success)
 
-	allLogs := gateway.AllLogs()
-	assert.Len(t, allLogs, 10)
 	assert.Len(t, gateway.Logs("info", "Started ExampleGateway"), 1)
 	assert.Len(t, gateway.Logs("info", "Created new active connection."), 2)