diff --git a/.gitignore b/.gitignore
index c2a59dfd..ba7608b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ node_modules/
 # misc
 npm-debug.log*
 yarn-error.log
+.DS_Store
 
 # ember-try
 .node_modules.ember-try/
diff --git a/test-packages/__snapshots__/my-app-test.js.snap b/test-packages/__snapshots__/my-app-test.js.snap
index a4814f72..d319124b 100644
--- a/test-packages/__snapshots__/my-app-test.js.snap
+++ b/test-packages/__snapshots__/my-app-test.js.snap
@@ -28,6 +28,58 @@ Object {
       "total": 4,
     },
   },
+  "app/models/my-model-global-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+    "statements": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+  },
+  "app/models/my-model-named-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "statements": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+  },
   "app/router.js": Object {
     "branches": Object {
       "covered": 0,
@@ -120,16 +172,16 @@ Object {
       "total": 2,
     },
     "lines": Object {
-      "covered": 6,
-      "pct": 75,
+      "covered": 7,
+      "pct": 77.78,
       "skipped": 0,
-      "total": 8,
+      "total": 9,
     },
     "statements": Object {
-      "covered": 6,
-      "pct": 75,
+      "covered": 7,
+      "pct": 77.78,
       "skipped": 0,
-      "total": 8,
+      "total": 9,
     },
   },
 }
@@ -163,6 +215,58 @@ Object {
       "total": 4,
     },
   },
+  "app/models/my-model-global-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+    "statements": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+  },
+  "app/models/my-model-named-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "statements": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+  },
   "app/router.js": Object {
     "branches": Object {
       "covered": 0,
@@ -255,16 +359,16 @@ Object {
       "total": 3,
     },
     "lines": Object {
-      "covered": 6,
-      "pct": 66.67,
+      "covered": 7,
+      "pct": 70,
       "skipped": 0,
-      "total": 9,
+      "total": 10,
     },
     "statements": Object {
-      "covered": 6,
-      "pct": 66.67,
+      "covered": 7,
+      "pct": 70,
       "skipped": 0,
-      "total": 9,
+      "total": 10,
     },
   },
 }
@@ -324,6 +428,58 @@ Object {
       "total": 1,
     },
   },
+  "app/models/my-model-global-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+    "statements": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+  },
+  "app/models/my-model-named-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "statements": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+  },
   "app/router.js": Object {
     "branches": Object {
       "covered": 0,
@@ -416,16 +572,16 @@ Object {
       "total": 3,
     },
     "lines": Object {
-      "covered": 7,
-      "pct": 70,
+      "covered": 8,
+      "pct": 72.73,
       "skipped": 0,
-      "total": 10,
+      "total": 11,
     },
     "statements": Object {
-      "covered": 7,
-      "pct": 70,
+      "covered": 8,
+      "pct": 72.73,
       "skipped": 0,
-      "total": 10,
+      "total": 11,
     },
   },
 }
@@ -459,6 +615,58 @@ Object {
       "total": 4,
     },
   },
+  "app/models/my-model-global-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+    "statements": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+  },
+  "app/models/my-model-named-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "statements": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+  },
   "app/router.js": Object {
     "branches": Object {
       "covered": 0,
@@ -551,16 +759,16 @@ Object {
       "total": 3,
     },
     "lines": Object {
-      "covered": 6,
-      "pct": 66.67,
+      "covered": 7,
+      "pct": 70,
       "skipped": 0,
-      "total": 9,
+      "total": 10,
     },
     "statements": Object {
-      "covered": 6,
-      "pct": 66.67,
+      "covered": 7,
+      "pct": 70,
       "skipped": 0,
-      "total": 9,
+      "total": 10,
     },
   },
 }
@@ -594,6 +802,58 @@ Object {
       "total": 4,
     },
   },
+  "app/models/my-model-global-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+    "statements": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+  },
+  "app/models/my-model-named-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "statements": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+  },
   "app/router.js": Object {
     "branches": Object {
       "covered": 0,
@@ -686,16 +946,16 @@ Object {
       "total": 3,
     },
     "lines": Object {
-      "covered": 6,
-      "pct": 66.67,
+      "covered": 7,
+      "pct": 70,
       "skipped": 0,
-      "total": 9,
+      "total": 10,
     },
     "statements": Object {
-      "covered": 6,
-      "pct": 66.67,
+      "covered": 7,
+      "pct": 70,
       "skipped": 0,
-      "total": 9,
+      "total": 10,
     },
   },
 }
@@ -729,6 +989,58 @@ Object {
       "total": 4,
     },
   },
+  "app/models/my-model-global-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 100,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+    "statements": Object {
+      "covered": 1,
+      "pct": 100,
+      "skipped": 0,
+      "total": 1,
+    },
+  },
+  "app/models/my-model-named-import.js": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+    "statements": Object {
+      "covered": 0,
+      "pct": 0,
+      "skipped": 0,
+      "total": 0,
+    },
+  },
   "app/router.js": Object {
     "branches": Object {
       "covered": 0,
@@ -821,16 +1133,16 @@ Object {
       "total": 3,
     },
     "lines": Object {
-      "covered": 6,
-      "pct": 66.67,
+      "covered": 7,
+      "pct": 70,
       "skipped": 0,
-      "total": 9,
+      "total": 10,
     },
     "statements": Object {
-      "covered": 6,
-      "pct": 66.67,
+      "covered": 7,
+      "pct": 70,
       "skipped": 0,
-      "total": 9,
+      "total": 10,
     },
   },
 }
diff --git a/test-packages/my-app/app/models/my-model-global-import.js b/test-packages/my-app/app/models/my-model-global-import.js
new file mode 100644
index 00000000..e4386c9b
--- /dev/null
+++ b/test-packages/my-app/app/models/my-model-global-import.js
@@ -0,0 +1,5 @@
+import DS from 'ember-data';
+
+const { Model } = DS;
+
+export default class MyModelGlobalImportModel extends Model {}
diff --git a/test-packages/my-app/app/models/my-model-named-import.js b/test-packages/my-app/app/models/my-model-named-import.js
new file mode 100644
index 00000000..43e4d100
--- /dev/null
+++ b/test-packages/my-app/app/models/my-model-named-import.js
@@ -0,0 +1,3 @@
+import Model from '@ember-data/model';
+
+export default class MyModelNamedImportModel extends Model {}
diff --git a/test-packages/my-app/tests/unit/models/my-model-global-import-test.js b/test-packages/my-app/tests/unit/models/my-model-global-import-test.js
new file mode 100644
index 00000000..5d9ed01d
--- /dev/null
+++ b/test-packages/my-app/tests/unit/models/my-model-global-import-test.js
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Model | my model global import', function(hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function(assert) {
+    let store = this.owner.lookup('service:store');
+    let model = store.createRecord('my-model-global-import', {});
+    assert.ok(model);
+  });
+});
diff --git a/test-packages/my-app/tests/unit/models/my-model-named-import-test.js b/test-packages/my-app/tests/unit/models/my-model-named-import-test.js
new file mode 100644
index 00000000..02f539d5
--- /dev/null
+++ b/test-packages/my-app/tests/unit/models/my-model-named-import-test.js
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Model | my model named import', function(hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function(assert) {
+    let store = this.owner.lookup('service:store');
+    let model = store.createRecord('my-model-named-import', {});
+    assert.ok(model);
+  });
+});