diff --git a/BuildServer/lib/tasks/dotnetnunitall.js b/BuildServer/lib/tasks/dotnetnunitall.js
new file mode 100644
index 0000000..21b2fd2
--- /dev/null
+++ b/BuildServer/lib/tasks/dotnetnunitall.js
@@ -0,0 +1,37 @@
+"use strict";
+
+var glob = require('glob');
+var dotNetBuilderWrapper = require('./dotnetbuilderwrapper');
+
+module.exports = function (params, processor) {
+	return {
+		process: function () {
+			glob("**/bin/**/*.{Tests,Test}.dll", {cwd: processor.context.exported}, function (err, files) {
+				if (err) {
+					processor.onError(err);
+					return processor.done();
+				}
+
+				if (!files || !files.length) {
+					processor.onError("No test assemblies found");
+					return processor.done();
+				}
+
+				return processor.processTask({
+					type: "parallel",
+					params: {
+						tasks: files.map(function (file) {
+							return {
+								name: file,
+								type: "dotnetnunit",
+								params: {
+									assembly: file
+								}
+							};
+						})
+					}
+				}, processor.done.bind(processor));
+			})
+		}
+	};
+};
diff --git a/BuildServer/package.json b/BuildServer/package.json
index 7a65155..9d81f07 100644
--- a/BuildServer/package.json
+++ b/BuildServer/package.json
@@ -11,6 +11,7 @@
     "async": "~0.2.9",
     "fs-extra": "~0.8.1",
     "git-node": "~0.1.1",
-    "request": "~2.27.0"
+    "request": "~2.27.0",
+    "glob": "~3.2.7"
   }
 }