diff --git a/src/application-manager.coffee b/src/application-manager.coffee
index 17d2471a..22ec882f 100644
--- a/src/application-manager.coffee
+++ b/src/application-manager.coffee
@@ -68,7 +68,7 @@ createApplicationManagerRouter = (applications) ->
 
 	return router
 
-module.exports = class ApplicationManager extends EventEmitter
+exports.ApplicationManager = class ApplicationManager extends EventEmitter
 	constructor: ({ @logger, @config, @db, @eventTracker, @deviceState }) ->
 		@docker = new Docker()
 		@images = new Images({ @docker, @logger, @db, @config })
diff --git a/src/application-manager.d.ts b/src/application-manager.d.ts
index 23f5ac3e..5275a8c9 100644
--- a/src/application-manager.d.ts
+++ b/src/application-manager.d.ts
@@ -121,4 +121,4 @@ class ApplicationManager extends EventEmitter {
 	public localModeSwitchCompletion(): Promise<void>;
 }
 
-export = ApplicationManager;
+export { ApplicationManager };
diff --git a/src/compose/composition-steps.ts b/src/compose/composition-steps.ts
index 495055cf..d148a3c7 100644
--- a/src/compose/composition-steps.ts
+++ b/src/compose/composition-steps.ts
@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 
 import Config from '../config';
 
-import ApplicationManager = require('../application-manager');
+import { ApplicationManager } from '../application-manager';
 import Images, { Image } from './images';
 import Network from './network';
 import Service from './service';
diff --git a/src/device-api/v2.ts b/src/device-api/v2.ts
index 3dfd20f9..a46f817e 100644
--- a/src/device-api/v2.ts
+++ b/src/device-api/v2.ts
@@ -3,7 +3,7 @@ import { NextFunction, Request, Response, Router } from 'express';
 import * as _ from 'lodash';
 import { fs } from 'mz';
 
-import ApplicationManager = require('../application-manager');
+import { ApplicationManager } from '../application-manager';
 import { Service } from '../compose/service';
 import {
 	appNotFoundMessage,
diff --git a/src/device-state.ts b/src/device-state.ts
index 697fdcd9..f23ac50b 100644
--- a/src/device-state.ts
+++ b/src/device-state.ts
@@ -25,7 +25,7 @@ import * as updateLock from './lib/update-lock';
 import * as validation from './lib/validation';
 import * as network from './network';
 
-import ApplicationManager = require('./application-manager');
+import { ApplicationManager } from './application-manager';
 import DeviceConfig, { ConfigStep } from './device-config';
 import { log } from './lib/supervisor-console';
 import {
diff --git a/src/lib/migration.ts b/src/lib/migration.ts
index 01fe899f..2cd50224 100644
--- a/src/lib/migration.ts
+++ b/src/lib/migration.ts
@@ -9,7 +9,7 @@ import * as rimraf from 'rimraf';
 const mkdirpAsync = Bluebird.promisify(mkdirp);
 const rimrafAsync = Bluebird.promisify(rimraf);
 
-import ApplicationManager = require('../application-manager');
+import { ApplicationManager } from '../application-manager';
 import Config from '../config';
 import Database, { Transaction } from '../db';
 import DeviceState from '../device-state';
diff --git a/src/target-state.ts b/src/target-state.ts
index 9435968b..e8df4ffb 100644
--- a/src/target-state.ts
+++ b/src/target-state.ts
@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
 
-import ApplicationManager = require('./application-manager');
+import { ApplicationManager } from './application-manager';
 import Config from './config';
 import Database, { Transaction } from './db';