diff --git a/app/controllers/events/list.js b/app/controllers/events/list.js
index ae47c68ce19..dd78d1d7471 100644
--- a/app/controllers/events/list.js
+++ b/app/controllers/events/list.js
@@ -1,14 +1,9 @@
 import Controller from '@ember/controller';
 import { computed, action } from '@ember/object';
+import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
+
+export default class extends Controller.extend(EmberTableControllerMixin) {
 
-export default class extends Controller {
-  queryParams = ['page', 'per_page'];
-  page = 1;
-  per_page = 10;
-  search = null;
-  sort_dir = null;
-  sort_by = null;
-  sorts = [];
   @computed()
   get columns() {
     return [
diff --git a/app/mixins/ember-table-controller.js b/app/mixins/ember-table-controller.js
new file mode 100644
index 00000000000..1e4be3ce4f3
--- /dev/null
+++ b/app/mixins/ember-table-controller.js
@@ -0,0 +1,11 @@
+import Mixin from '@ember/object/mixin';
+
+export default Mixin.create({
+  queryParams : ['page', 'per_page', 'search', 'sort_dir', 'sort_by'],
+  page        : 1,
+  per_page    : 10,
+  search      : null,
+  sort_dir    : null,
+  sort_by     : null,
+  sorts       : []
+});
diff --git a/app/mixins/ember-table.js b/app/mixins/ember-table-route.js
similarity index 100%
rename from app/mixins/ember-table.js
rename to app/mixins/ember-table-route.js
diff --git a/app/routes/events/list.js b/app/routes/events/list.js
index 5a2f1266fa9..1ce72c0816a 100644
--- a/app/routes/events/list.js
+++ b/app/routes/events/list.js
@@ -1,8 +1,8 @@
 import Route from '@ember/routing/route';
 import { action } from '@ember/object';
 import moment from 'moment';
-import EmberTableMixin from 'open-event-frontend/mixins/ember-table';
-export default class extends Route.extend(EmberTableMixin) {
+import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
+export default class extends Route.extend(EmberTableRouteMixin) {
 
   titleToken() {
     switch (this.get('params.event_state')) {
diff --git a/tests/unit/mixins/ember-table-controller-test.js b/tests/unit/mixins/ember-table-controller-test.js
new file mode 100644
index 00000000000..5f46b87f863
--- /dev/null
+++ b/tests/unit/mixins/ember-table-controller-test.js
@@ -0,0 +1,12 @@
+import EmberObject from '@ember/object';
+import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
+import { module, test } from 'qunit';
+
+module('Unit | Mixin | ember-table-controller', function() {
+  // Replace this with your real tests.
+  test('it works', function(assert) {
+    let EmberTableControllerObject = EmberObject.extend(EmberTableControllerMixin);
+    let subject = EmberTableControllerObject.create();
+    assert.ok(subject);
+  });
+});
diff --git a/tests/unit/mixins/ember-table-route-test.js b/tests/unit/mixins/ember-table-route-test.js
new file mode 100644
index 00000000000..7f3cf80b3b1
--- /dev/null
+++ b/tests/unit/mixins/ember-table-route-test.js
@@ -0,0 +1,12 @@
+import EmberObject from '@ember/object';
+import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
+import { module, test } from 'qunit';
+
+module('Unit | Mixin | ember-table-route', function() {
+  // Replace this with your real tests.
+  test('it works', function(assert) {
+    let EmberTableRouteObject = EmberObject.extend(EmberTableRouteMixin);
+    let subject = EmberTableRouteObject.create();
+    assert.ok(subject);
+  });
+});
diff --git a/tests/unit/mixins/ember-table-test.js b/tests/unit/mixins/ember-table-test.js
deleted file mode 100644
index 88aa7ae2af6..00000000000
--- a/tests/unit/mixins/ember-table-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import EmberObject from '@ember/object';
-import EmberTableMixin from 'open-event-frontend/mixins/ember-table';
-import { module, test } from 'qunit';
-
-module('Unit | Mixin | ember-table', function() {
-  // Replace this with your real tests.
-  test('it works', function(assert) {
-    let EmberTableObject = EmberObject.extend(EmberTableMixin);
-    let subject = EmberTableObject.create();
-    assert.ok(subject);
-  });
-});