@@ -26,6 +26,37 @@ describe('agones', () => {
 		agonesSDK = new AgonesSDK();
 	});
 
+	describe('port', () => {
+		it('returns the default port if $AGONES_SDK_GRPC_PORT is not defined', async () => {
+			let port = agonesSDK.port;
+			expect(port).toEqual('59357');
+		});
+
+		it('returns the default port if $AGONES_SDK_GRPC_PORT is not an integer', async () => {
+			process.env.AGONES_SDK_GRPC_PORT = "random string";
+			let port = agonesSDK.port;
+			expect(port).toEqual('59357');
+		});
+
+		it('returns the default port if $AGONES_SDK_GRPC_PORT is to large of an integer', async () => {
+			process.env.AGONES_SDK_GRPC_PORT = '4455667788';
+			let port = agonesSDK.port;
+			expect(port).toEqual('59357');
+		});
+
+		it('returns the default port if $AGONES_SDK_GRPC_PORT is to small of an integer', async () => {
+			process.env.AGONES_SDK_GRPC_PORT = '0';
+			let port = agonesSDK.port;
+			expect(port).toEqual('59357');
+		});
+
+		it('returns the port set in $AGONES_SDK_GRPC_PORT', async () => {
+			process.env.AGONES_SDK_GRPC_PORT = '6789';
+			let port = agonesSDK.port;
+			expect(port).toEqual('6789');
+		});
+	});
+
 	describe('connect', () => {
 		it('calls the server and handles success', async () => {
 			spyOn(agonesSDK.client, 'waitForReady').and.callFake((deadline, callback) => {
 
@@ -19,11 +19,30 @@ const services = require('../lib/sdk_grpc_pb');
 
 class AgonesSDK {
 	constructor() {
-		this.client = new services.SDKClient('localhost:59357', grpc.credentials.createInsecure());
+		this.client = new services.SDKClient('localhost:'+this.port, grpc.credentials.createInsecure());
 		this.healthStream = undefined;
 		this.emitters = [];
 	}
 
+	get port() {
+		const defaultPort = '59357';
+		const port = process.env.AGONES_SDK_GRPC_PORT;
+		if (port === undefined) {
+			console.log(`Environment variable AGONES_SDK_GRPC_PORT not defined, using default port ${defaultPort}`);
+			return defaultPort;
+		}
+		const portNum = parseInt(port, 10);
+		if (isNaN(portNum)) {
+			console.log(`Unable to parse '${port}' defined in AGONES_SDK_GRPC_PORT into an integer`);
+			return defaultPort;
+		}
+		if (portNum < 1 || portNum > 65535) {
+			console.log(`Invalid port ${portNum} defined in AGONES_SDK_GRPC_PORT. It must be between 1 and 65535`);
+			return defaultPort;
+		}
+		return port;
+	}
+
 	async connect() {
 		return new Promise((resolve, reject) => {
 			this.client.waitForReady(Date.now() + 30000, (error) => {
@@ -32,7 +51,7 @@ class AgonesSDK {
 				} else {
 					resolve();
 				}
-			})
+			});
 		});
 	}