diff --git a/index.js b/index.js
index 07a2769..cdb89c7 100644
--- a/index.js
+++ b/index.js
@@ -37,7 +37,7 @@ module.exports = function budoExpress(options = {}) {
 	};
 
 	if (process.env.BUDO_BUILD === "1") {
-		bundle(context);
+		return bundle(context);
 	} else {
 		let productionHost = defaultValue(options.host, "::");
 		let developmentHost = (options.allowUnsafeHost) ? productionHost : "127.0.0.1";
@@ -46,12 +46,12 @@ module.exports = function budoExpress(options = {}) {
 		let developmentMode = getDevelopmentMode(developmentModeSetting);
 
 		if (developmentMode) {
-			developmentServer({
+			return developmentServer({
 				... context,
 				host: developmentHost
 			});
 		} else {
-			productionServer({
+			return productionServer({
 				... context,
 				host: productionHost
 			});
diff --git a/operations/bundle.js b/operations/bundle.js
index 3db4bfc..69bb618 100644
--- a/operations/bundle.js
+++ b/operations/bundle.js
@@ -24,7 +24,7 @@ module.exports = function bundle({ options, staticPath, entryPaths }) {
 	return Promise.try(() => {
 		return mkdirAsync(targetFolder, { recursive: true });
 	}).then(() => {
-		browserifyInstance
+		return browserifyInstance
 			.bundle()
 			.pipe(fs.createWriteStream(targetBundlePath))
 			.on("finish", () => {
diff --git a/operations/development-server.js b/operations/development-server.js
index 3a5ffed..9ef33aa 100644
--- a/operations/development-server.js
+++ b/operations/development-server.js
@@ -90,4 +90,5 @@ module.exports = function ({ options, staticPath, staticBasePath, entryPaths, ho
 				devServer.reload("*");
 			});
 		});
+	return devServer;
 };
diff --git a/operations/production-server.js b/operations/production-server.js
index 92a8e73..d54d8a5 100644
--- a/operations/production-server.js
+++ b/operations/production-server.js
@@ -1,7 +1,7 @@
 "use strict";
 
 module.exports = function productionServer({ options, host }) {
-	options.expressApp
+	return options.expressApp
 		.listen({ port: options.port, host: host })
 		.on("listening", (_event) => {
 			console.log(`Production server running on ${(host === "::") ? "*" : host}:${options.port}`);