diff --git a/packages/ember-data/lib/system/store.js b/packages/ember-data/lib/system/store.js
index 71127c9b7e8..0b2f9b76db7 100644
--- a/packages/ember-data/lib/system/store.js
+++ b/packages/ember-data/lib/system/store.js
@@ -1172,11 +1172,7 @@ Store = Service.extend({
     Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of '+ Ember.inspect(modelName), typeof modelName === 'string');
 
     if (!Ember.ENV.ENABLE_DS_FILTER) {
-      Ember.deprecate('The filter API will be moved into a plugin soon. To enable store.filter using an environment flag, or to use an alternative, you can visit the ember-data-filter addon page', false, {
-        url: 'https://github.com/ember-data/ember-data-filter',
-        id: 'ds.store.filter-deprecated',
-        until: '2.0.0'
-      });
+      Ember.assert('The filter API has been moved to a plugin. To enable store.filter using an environment flag, or to use an alternative, you can visit the ember-data-filter addon page. https://github.com/ember-data/ember-data-filter', false);
     }
 
     var promise;
diff --git a/packages/ember-data/tests/unit/store/adapter-interop-test.js b/packages/ember-data/tests/unit/store/adapter-interop-test.js
index 423c4e06df6..3d1bd0e74a9 100644
--- a/packages/ember-data/tests/unit/store/adapter-interop-test.js
+++ b/packages/ember-data/tests/unit/store/adapter-interop-test.js
@@ -1,16 +1,19 @@
 var get = Ember.get;
 var set = Ember.set;
 var resolve = Ember.RSVP.resolve;
-var TestAdapter, store, person;
+var TestAdapter, store, person, oldFilterEnabled;
 var run = Ember.run;
 
 module("unit/store/adapter-interop - DS.Store working with a DS.Adapter", {
   setup: function() {
     TestAdapter = DS.Adapter.extend();
+    oldFilterEnabled = Ember.ENV.ENABLE_DS_FILTER;
+    Ember.ENV.ENABLE_DS_FILTER = false;
   },
   teardown: function() {
     run(function() {
       if (store) { store.destroy(); }
+      Ember.ENV.ENABLE_DS_FILTER = oldFilterEnabled;
     });
   }
 });
@@ -1233,6 +1236,25 @@ test("store should reload all records in the background when `shouldBackgroundRe
   equal(store.peekRecord('person', 1).get('name'), 'Tom');
 });
 
+test("store should assert of the user tries to call store.filter", function() {
+  expect(1);
+
+  var Person = DS.Model.extend({
+    name: DS.attr('string')
+  });
+
+  store = createStore({
+    person: Person
+  });
+
+  expectAssertion(function() {
+    run(function() {
+      store.filter('person', {});
+    });
+  }, /The filter API has been moved to a plugin/);
+});
+
+
 test("Calling adapterFor with a model class should assert", function() {
   var Person = DS.Model.extend({
     name: DS.attr('string')