diff --git a/index.js b/index.js
index 25dad8beab5..42a68129a3e 100644
--- a/index.js
+++ b/index.js
@@ -89,10 +89,12 @@ module.exports = {
       this.app.options &&
       this.app.options.emberData &&
       this.app.options.emberData.enableRecordDataRFCBuild;
+    let isEmberDataItself = this.isDevelopingAddon();
+    let useLegacyBuild = isEmberDataItself && (USE_RECORD_DATA_RFC || optionFlag === false);
 
     return {
       emberData: {
-        enableRecordDataRFCBuild: USE_RECORD_DATA_RFC || optionFlag || false,
+        enableRecordDataRFCBuild: !useLegacyBuild || true,
       },
     };
   },
diff --git a/package.json b/package.json
index 3822ffb6b78..79f436c70ee 100644
--- a/package.json
+++ b/package.json
@@ -12,11 +12,11 @@
     "build:production": "ember build --environment=production",
     "lint:js": "eslint .",
     "start": "ember server",
-    "test": "ember test && ember test --record-data-rfc-build",
+    "test": "ember test",
     "test:all": "ember try:each",
     "test:node": "node node-tests/nodetest-runner.js",
-    "test:production": "ember test -e production && ember test -e production --record-data-rfc-build",
-    "test:optional-features": "ember test -e test-optional-features && ember test -e test-optional-features --record-data-rfc-build",
+    "test:production": "ember test -e production",
+    "test:optional-features": "ember test -e test-optional-features",
     "test-external:ember-m3": "node ./lib/scripts/test-external ember-m3 https://github.com/hjdivad/ember-m3.git",
     "test-external:ember-data-change-tracker": "node ./lib/scripts/test-external ember-data-change-tracker https://github.com/danielspaniel/ember-data-change-tracker.git",
     "test-external:emberaddons.com": "node ./lib/scripts/test-external ember-cli-addon-search https://github.com/gcollazo/ember-cli-addon-search.git",