diff --git a/config/environment.js b/config/environment.js
index 8d03ba05410..7c463cb69cf 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -26,6 +26,10 @@ module.exports = function(environment) {
     fastboot: {
       hostWhitelist: ['crates.io', /^localhost:\d+$/, /\.herokuapp\.com$/],
     },
+
+    'ember-cli-mirage': {
+      discoverEmberDataModels: false,
+    },
   };
 
   if (environment === 'development') {
@@ -55,6 +59,7 @@ module.exports = function(environment) {
 
   if (environment === 'production') {
     // here you can enable a production-specific feature
+    delete ENV['ember-cli-mirage'];
 
     // Heroku Git Hash support
     if (process.env.SOURCE_VERSION) {
diff --git a/mirage/models/api-token.js b/mirage/models/api-token.js
new file mode 100644
index 00000000000..770b50936d3
--- /dev/null
+++ b/mirage/models/api-token.js
@@ -0,0 +1,3 @@
+import { Model } from 'ember-cli-mirage';
+
+export default Model.extend({});
diff --git a/mirage/models/category-slug.js b/mirage/models/category-slug.js
new file mode 100644
index 00000000000..770b50936d3
--- /dev/null
+++ b/mirage/models/category-slug.js
@@ -0,0 +1,3 @@
+import { Model } from 'ember-cli-mirage';
+
+export default Model.extend({});
diff --git a/mirage/models/category.js b/mirage/models/category.js
new file mode 100644
index 00000000000..770b50936d3
--- /dev/null
+++ b/mirage/models/category.js
@@ -0,0 +1,3 @@
+import { Model } from 'ember-cli-mirage';
+
+export default Model.extend({});
diff --git a/mirage/models/crate-owner-invite.js b/mirage/models/crate-owner-invite.js
new file mode 100644
index 00000000000..770b50936d3
--- /dev/null
+++ b/mirage/models/crate-owner-invite.js
@@ -0,0 +1,3 @@
+import { Model } from 'ember-cli-mirage';
+
+export default Model.extend({});
diff --git a/mirage/models/crate.js b/mirage/models/crate.js
index 581e5e978fd..770b50936d3 100644
--- a/mirage/models/crate.js
+++ b/mirage/models/crate.js
@@ -1,3 +1,3 @@
 import { Model } from 'ember-cli-mirage';
 
-export default Model;
+export default Model.extend({});
diff --git a/mirage/models/dependency.js b/mirage/models/dependency.js
new file mode 100644
index 00000000000..770b50936d3
--- /dev/null
+++ b/mirage/models/dependency.js
@@ -0,0 +1,3 @@
+import { Model } from 'ember-cli-mirage';
+
+export default Model.extend({});
diff --git a/mirage/models/keyword.js b/mirage/models/keyword.js
new file mode 100644
index 00000000000..770b50936d3
--- /dev/null
+++ b/mirage/models/keyword.js
@@ -0,0 +1,3 @@
+import { Model } from 'ember-cli-mirage';
+
+export default Model.extend({});
diff --git a/mirage/models/owned-crate.js b/mirage/models/owned-crate.js
new file mode 100644
index 00000000000..770b50936d3
--- /dev/null
+++ b/mirage/models/owned-crate.js
@@ -0,0 +1,3 @@
+import { Model } from 'ember-cli-mirage';
+
+export default Model.extend({});
diff --git a/mirage/models/team.js b/mirage/models/team.js
new file mode 100644
index 00000000000..770b50936d3
--- /dev/null
+++ b/mirage/models/team.js
@@ -0,0 +1,3 @@
+import { Model } from 'ember-cli-mirage';
+
+export default Model.extend({});
diff --git a/mirage/models/user.js b/mirage/models/user.js
new file mode 100644
index 00000000000..770b50936d3
--- /dev/null
+++ b/mirage/models/user.js
@@ -0,0 +1,3 @@
+import { Model } from 'ember-cli-mirage';
+
+export default Model.extend({});
diff --git a/mirage/models/version-download.js b/mirage/models/version-download.js
index 581e5e978fd..770b50936d3 100644
--- a/mirage/models/version-download.js
+++ b/mirage/models/version-download.js
@@ -1,3 +1,3 @@
 import { Model } from 'ember-cli-mirage';
 
-export default Model;
+export default Model.extend({});
diff --git a/mirage/models/version.js b/mirage/models/version.js
index 581e5e978fd..770b50936d3 100644
--- a/mirage/models/version.js
+++ b/mirage/models/version.js
@@ -1,3 +1,3 @@
 import { Model } from 'ember-cli-mirage';
 
-export default Model;
+export default Model.extend({});