diff --git a/app/assets/javascripts/discourse/routes/discovery_route_builders.js b/app/assets/javascripts/discourse/routes/discovery_route_builders.js
index 24b2d4ac7ba..0d09ec0a3a0 100644
--- a/app/assets/javascripts/discourse/routes/discovery_route_builders.js
+++ b/app/assets/javascripts/discourse/routes/discovery_route_builders.js
@@ -108,8 +108,7 @@ function buildCategoryRoute(filter, params) {
       opts.noSubcategories = params && params.no_subcategories;
       opts.canEditCategory = Discourse.User.currentProp('staff');
 
-      // TODO: @Neil FIXME, this breaks qunit!
-      // opts.canChangeCategoryNotificationLevel = Discourse.User.current();
+      opts.canChangeCategoryNotificationLevel = Discourse.User.current();
       this.controllerFor('navigation/category').setProperties(opts);
 
       return Discourse.TopicList.list(listFilter, params).then(function(list) {
diff --git a/test/javascripts/integration/discover_topics_test.js b/test/javascripts/integration/discover_topics_test.js
index 2930e0ed7a4..c5dfda60f79 100644
--- a/test/javascripts/integration/discover_topics_test.js
+++ b/test/javascripts/integration/discover_topics_test.js
@@ -12,6 +12,8 @@ test("Default List", function() {
 test("List one Category", function() {
   expect(2);
 
+  this.stub(Discourse.User, "current").returns(null);
+
   visit("/category/bug").then(function() {
     ok(exists("#topic-list"), "The list of topics was rendered");
     ok(exists('#topic-list .topic-list-item'), "has topics");