diff --git a/packages/grpc-js/src/index.ts b/packages/grpc-js/src/index.ts
index e49cfb5d..d846b6c0 100644
--- a/packages/grpc-js/src/index.ts
+++ b/packages/grpc-js/src/index.ts
@@ -38,6 +38,7 @@ import {
   Serialize,
 } from './make-client';
 import { Metadata } from './metadata';
+import { Server } from './server';
 import { KeyCertPair, ServerCredentials } from './server-credentials';
 import { StatusBuilder } from './status-builder';
 
@@ -259,10 +260,7 @@ export const setLogVerbosity = (verbosity: LogVerbosity): void => {
   logging.setLoggerVerbosity(verbosity);
 };
 
-export const Server = (options: any) => {
-  throw new Error('Not yet implemented');
-};
-
+export { Server };
 export { ServerCredentials };
 export { KeyCertPair };
 
diff --git a/packages/grpc-js/test/test-server-deadlines.ts b/packages/grpc-js/test/test-server-deadlines.ts
index ef54ef3f..2a1d3df9 100644
--- a/packages/grpc-js/test/test-server-deadlines.ts
+++ b/packages/grpc-js/test/test-server-deadlines.ts
@@ -21,10 +21,9 @@ import * as assert from 'assert';
 import * as path from 'path';
 
 import * as grpc from '../src';
-import { ServerCredentials } from '../src';
+import { Server, ServerCredentials } from '../src';
 import { ServiceError } from '../src/call';
 import { ServiceClient, ServiceClientConstructor } from '../src/make-client';
-import { Server } from '../src/server';
 import {
   sendUnaryData,
   ServerUnaryCall,
diff --git a/packages/grpc-js/test/test-server-errors.ts b/packages/grpc-js/test/test-server-errors.ts
index 6faf19ea..d429330d 100644
--- a/packages/grpc-js/test/test-server-errors.ts
+++ b/packages/grpc-js/test/test-server-errors.ts
@@ -21,9 +21,9 @@ import * as assert from 'assert';
 import { join } from 'path';
 
 import * as grpc from '../src';
+import { Server } from '../src';
 import { ServiceError } from '../src/call';
 import { ServiceClient, ServiceClientConstructor } from '../src/make-client';
-import { Server } from '../src/server';
 import {
   sendUnaryData,
   ServerDuplexStream,
diff --git a/packages/grpc-js/test/test-server.ts b/packages/grpc-js/test/test-server.ts
index fb59739c..09259481 100644
--- a/packages/grpc-js/test/test-server.ts
+++ b/packages/grpc-js/test/test-server.ts
@@ -23,10 +23,9 @@ import * as http2 from 'http2';
 import * as path from 'path';
 
 import * as grpc from '../src';
-import { ServerCredentials } from '../src';
+import { Server, ServerCredentials } from '../src';
 import { ServiceError } from '../src/call';
 import { ServiceClient, ServiceClientConstructor } from '../src/make-client';
-import { Server } from '../src/server';
 import { sendUnaryData, ServerUnaryCall } from '../src/server-call';
 
 import { loadProtoFile } from './common';