diff --git a/packages/grpc-native-core/ext/server.h b/packages/grpc-native-core/ext/server.h
index 188e7054..6637e089 100644
--- a/packages/grpc-native-core/ext/server.h
+++ b/packages/grpc-native-core/ext/server.h
@@ -61,7 +61,6 @@ class Server : public Nan::ObjectWrap {
   Nan::Persistent<v8::Value> running_self_ref;
 
   grpc_server *wrapped_server;
-  grpc_completion_queue *shutdown_queue;
   bool is_shutdown;
 };
 
diff --git a/packages/grpc-native-core/test/server_test.js b/packages/grpc-native-core/test/server_test.js
index 5351c138..b06236ef 100644
--- a/packages/grpc-native-core/test/server_test.js
+++ b/packages/grpc-native-core/test/server_test.js
@@ -62,6 +62,10 @@ describe('server', function() {
     before(function() {
       server = new grpc.Server();
     });
+    after(function() {
+      server.start();
+      server.forceShutdown();
+    });
     it('should bind to an unused port', function() {
       var port;
       assert.doesNotThrow(function() {
@@ -85,12 +89,6 @@ describe('server', function() {
       assert(port > 0);
     });
   });
-  describe('addSecureHttp2Port', function() {
-    var server;
-    before(function() {
-      server = new grpc.Server();
-    });
-  });
   describe('start', function() {
     var server;
     before(function() {