diff --git a/src/dispatcher/androidDevice.js b/src/dispatcher/androidDevice.js
index e637e0bbe..b663d3eb8 100644
--- a/src/dispatcher/androidDevice.js
+++ b/src/dispatcher/androidDevice.js
@@ -79,7 +79,11 @@ export default (store: Store, logger: Logger) => {
             );
           }
         })
-        .then(adb.createClient),
+        .then(() =>
+          adb.createClient({
+            port: process.env.ANDROID_ADB_SERVER_PORT || '5037',
+          }),
+        ),
       'createADBClient.shell',
     ).catch(err => {
       console.error(
diff --git a/src/utils/CertificateProvider.js b/src/utils/CertificateProvider.js
index 1dd051dcd..81000b685 100644
--- a/src/utils/CertificateProvider.js
+++ b/src/utils/CertificateProvider.js
@@ -75,7 +75,9 @@ export default class CertificateProvider {
 
   constructor(server: Server, logger: LogManager) {
     this.logger = logger;
-    this.adb = adb.createClient();
+    this.adb = adb.createClient({
+      port: process.env.ANDROID_ADB_SERVER_PORT || '5037',
+    });
     this.certificateSetup = reportPlatformFailures(
       this.ensureServerCertExists(),
       'ensureServerCertExists',