diff --git a/package.json b/package.json
index da7cb6cec..57401690e 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "fix": "eslint . --fix",
     "test": "jest --testPathPattern=node\\.js$ --no-cache",
     "test-electron": "jest --testPathPattern=electron\\.js$ --testEnvironment=@jest-runner/electron/environment --runner=@jest-runner/electron --no-cache",
-    "test-with-device": "USE_ELECTRON_STUBS=1 jest --testPathPattern=device\\.js$ --detectOpenHandles --no-cache",
+    "test-with-device": "USE_ELECTRON_STUBS=1 jest --testPathPattern=device\\.js$ --detectOpenHandles --forceExit --no-cache",
     "lint": "eslint . && flow check"
   },
   "optionalDependencies": {
diff --git a/src/__tests__/server.device.js b/src/__tests__/server.device.js
index eb148cc32..83312ec67 100644
--- a/src/__tests__/server.device.js
+++ b/src/__tests__/server.device.js
@@ -12,6 +12,7 @@ import configureStore from 'redux-mock-store';
 import path from 'path';
 import os from 'os';
 import fs from 'fs';
+import androidDevice from '../dispatcher/androidDevice';
 
 let server;
 const mockStore = configureStore([])(reducers(undefined, {type: 'INIT'}));
@@ -23,7 +24,12 @@ beforeAll(() => {
     fs.mkdirSync(flipperDir);
   }
 
-  server = new Server(new LogManager(), mockStore);
+  const logger = new LogManager();
+
+  // Set up android dispatcher, which does the adb reversing.
+  androidDevice(mockStore, logger);
+
+  server = new Server(logger, mockStore);
   return server.init();
 });