diff --git a/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js b/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js
new file mode 100644
index 00000000000..77576d6d45f
--- /dev/null
+++ b/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js
@@ -0,0 +1,14 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function() {
+  setupTest();
+
+  // Replace this with your real tests.
+  it('exists', function() {
+    let store = this.owner.lookup('service:store');
+    let model = store.createRecord('<%= dasherizedModuleName %>', {});
+    expect(model).to.be.ok;
+  });
+});
diff --git a/node-tests/blueprints/model-test.js b/node-tests/blueprints/model-test.js
index cc480a79e78..b1c7f6f78c9 100644
--- a/node-tests/blueprints/model-test.js
+++ b/node-tests/blueprints/model-test.js
@@ -140,6 +140,26 @@ describe('Acceptance: generate and destroy model blueprints', function() {
         });
       });
     });
+
+    describe('with ember-mocha v0.14+', function() {
+      beforeEach(function() {
+        modifyPackages([
+          { name: 'ember-cli-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.14.0');
+      });
+
+      it('model-test for mocha v0.14+', function() {
+        let args = ['model-test', 'foo'];
+
+        return emberGenerateDestroy(args, _file => {
+          expect(_file('tests/unit/models/foo-test.js')).to.equal(
+            fixture('model-test/mocha-rfc232.js')
+          );
+        });
+      });
+    });
   });
 
   describe('module unification', function() {
@@ -297,5 +317,29 @@ describe('Acceptance: generate and destroy model blueprints', function() {
         );
       });
     });
+
+    describe('with ember-mocha v0.14+', function() {
+      beforeEach(function() {
+        modifyPackages([
+          { name: 'ember-cli-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.14.0');
+      });
+
+      it('model-test for mocha v0.14+', function() {
+        let args = ['model-test', 'foo'];
+
+        return emberGenerateDestroy(
+          args,
+          _file => {
+            expect(_file('src/data/models/foo/model-test.js')).to.equal(
+              fixture('model-test/mocha-rfc232.js')
+            );
+          },
+          { isModuleUnification: true }
+        );
+      });
+    });
   });
 });
diff --git a/node-tests/fixtures/model-test/mocha-rfc232.js b/node-tests/fixtures/model-test/mocha-rfc232.js
new file mode 100644
index 00000000000..9c94ea35029
--- /dev/null
+++ b/node-tests/fixtures/model-test/mocha-rfc232.js
@@ -0,0 +1,14 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('Unit | Model | foo', function() {
+  setupTest();
+
+  // Replace this with your real tests.
+  it('exists', function() {
+    let store = this.owner.lookup('service:store');
+    let model = store.createRecord('foo', {});
+    expect(model).to.be.ok;
+  });
+});