diff --git a/test/javascripts/controllers/controller_test.js b/test/javascripts/controllers/controller_test.js
new file mode 100644
index 00000000000..f5ee52d1845
--- /dev/null
+++ b/test/javascripts/controllers/controller_test.js
@@ -0,0 +1,6 @@
+module("Discourse.Controller");
+
+test("includes mixins", function() {
+  ok(Discourse.Presence.detect(Discourse.Controller.create()), "Discourse.Presence");
+  ok(Discourse.HasCurrentUser.detect(Discourse.Controller.create()), "Discourse.HasCurrentUser");
+});